am 40eade14: Merge from open-source master

* commit '40eade14bb87d24903588de04449fdfe2e1795cb': Fix crash by "adb shell pm list permissions -f|-s"
2010-12-02 07:59:52 -08:00
parent 5561ecff7b 40eade14bb
commit b087ceead7
1 changed files with 5 additions and 3 deletions
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -341,9 +341,11 @@ public final class Pm {
        if (nonLocalized != null) {
            return nonLocalized.toString();
        }
-        Resources r = getResources(pii);
-        if (r != null) {
-            return r.getString(res);
+        if (res != 0) {
+            Resources r = getResources(pii);
+            if (r != null) {
+                return r.getString(res);
+            }
        }
        return null;
    }