commit 45159937bc6acfabcb5424f37207b3be963d8ae9
author Narayan Kamath <narayan@google.com> Mon Dec 29 11:14:51 2014 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 29 11:14:51 2014 +0000
tree 37f211eb7bcf6bc914bd6a6d2d2902d683578783
parent ea84327fa48a33e3729c290ffe0862d86deb24a4
parent 1cc57aba8128134f55b6d5e4f4800c51e3472828

am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"
automerge: 1cc57ab

* commit '1cc57aba8128134f55b6d5e4f4800c51e3472828':
  Fix "pm list permissions" crash if resource string missing

cmds/pm/src/com/android/commands/pm/Pm.java

diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index 7fd586f..dfe1fce 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -549,7 +549,10 @@
         if (res != 0) {
             Resources r = getResources(pii);
             if (r != null) {
-                return r.getString(res);
+                try {
+                    return r.getString(res);
+                } catch (Resources.NotFoundException e) {
+                }
             }
         }
         return null;