Merge "Fix "pm list permissions" crash if resource string missing"

2014-12-29 11:01:27 +00:00
parent 712a02050e bf8b57af35
commit 44a5a30a61
1 changed files with 4 additions and 1 deletions
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -563,7 +563,10 @@ public final class Pm {
        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;