summaryrefslogtreecommitdiffstats
path: root/cmds/pm
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-12-02 08:03:25 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-02 08:03:25 -0800
commitedebb2fe1d1c4d3ad17db91cd7e2bfe8feafd0b7 (patch)
tree763749fe5178479da84f47bc75e5d4f9607fdff7 /cmds/pm
parent0d76ca7a979b8e7cdf27a619a2a6df8b331a0d31 (diff)
parentb087ceead79bcb304e5793c6ae9109ce590847dc (diff)
downloadframeworks_base-edebb2fe1d1c4d3ad17db91cd7e2bfe8feafd0b7.zip
frameworks_base-edebb2fe1d1c4d3ad17db91cd7e2bfe8feafd0b7.tar.gz
frameworks_base-edebb2fe1d1c4d3ad17db91cd7e2bfe8feafd0b7.tar.bz2
am b087ceea: am 40eade14: Merge from open-source master
* commit 'b087ceead79bcb304e5793c6ae9109ce590847dc': Fix crash by "adb shell pm list permissions -f|-s"
Diffstat (limited to 'cmds/pm')
-rw-r--r--cmds/pm/src/com/android/commands/pm/Pm.java8
1 files changed, 5 insertions, 3 deletions
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 @@ 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;
}