commit 44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a
author Narayan Kamath <narayan@google.com> Mon Dec 29 11:01:27 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 29 11:01:28 2014 +0000
tree 589959fe1eae3ac3e405d776845b485a22cb7336
parent 712a02050e7be4479f12a81aeb23d7217b8d7a8d
parent bf8b57af351ae9272b7490b373ca57b2a96e643a

Merge "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 5e9d8f7..5249065 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -563,7 +563,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;