commit 97c40a9deeb18393792fe5096143d6760422dbe6
author Mike Lockwood <lockwood@android.com> Thu Dec 02 09:19:01 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 02 09:19:01 2010 -0800
tree aa9f8dcf04d6b946c2c1eaf58fd78d96bf72b2de
parent edebb2fe1d1c4d3ad17db91cd7e2bfe8feafd0b7
parent 1474c7a2b60344c98bec11e91d8479c3a3901249

Merge "PTP: Add android.provider.Ptp to the public API"

cmds/pm/src/com/android/commands/pm/Pm.java

diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index 040421a..f62db1c 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -341,9 +341,11 @@
         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;
     }