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

* commit '1bafd01a3fc5f94e77d1c18e5a7dcdecddcaa47f': Fix "pm list permissions" crash if resource string missing
2014-12-29 11:13:22 +00:00
parent 7e6ae353f0 1bafd01a3f
commit 1cc57aba81
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
@@ -549,7 +549,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;