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

* commit '44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a': Fix "pm list permissions" crash if resource string missing
2014-12-29 11:06:53 +00:00
parent 7d019394f7 44a5a30a61
commit 1bafd01a3f
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) {
+                try {
                    return r.getString(res);
+                } catch (Resources.NotFoundException e) {
+                }
            }
        }
        return null;