Merge "Fix crash by "adb shell pm list permissions -f|-s""

Jean-Baptiste Queru · Android Code Review · commit e1de3f390e7b · 2010-12-01T09:47:14.000-08:00
diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -341,9 +341,11 @@ private String loadText(PackageItemInfo pii, int res, CharSequence nonLocalized)
         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;
     }

Original file line number	Diff line number	Diff line change
`@@ -341,9 +341,11 @@ private String loadText(PackageItemInfo pii, int res, CharSequence nonLocalized)`
`341`	`341`	`if (nonLocalized != null) {`
`342`	`342`	`return nonLocalized.toString();`
`343`	`343`	`}`
`344`		`- Resources r = getResources(pii);`
`345`		`- if (r != null) {`
`346`		`- return r.getString(res);`
	`344`	`+ if (res != 0) {`
	`345`	`+ Resources r = getResources(pii);`
	`346`	`+ if (r != null) {`
	`347`	`+ return r.getString(res);`
	`348`	`+ }`
`347`	`349`	`}`
`348`	`350`	`return null;`
`349`	`351`	`}`