summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAli Utku Selen <aliutku.selen@sonyericsson.com>2010-11-30 10:37:10 +0100
committerSteve Kondik <shade@chemlab.org>2010-12-01 19:10:25 -0500
commit366927ff8bbb696f12be295938ee2041b890b05c (patch)
tree5c4a31d6546e47d0986fb54117942d8d7a0f2ef4
parenta04bce380373c621795d6739314a494dfa924129 (diff)
downloadframeworks_base-366927ff8bbb696f12be295938ee2041b890b05c.zip
frameworks_base-366927ff8bbb696f12be295938ee2041b890b05c.tar.gz
frameworks_base-366927ff8bbb696f12be295938ee2041b890b05c.tar.bz2
Fix crash by "adb shell pm list permissions -f|-s"
pm command makes the assumption that every permission should contain android:description and android:label attributes while they are not mandatory. If a permission does not contain these two attributes, we get "android.content.res. Resources$NotFoundException: String resource ID #0x0" followed by a NPE when using -f or -s options. With the following change, users will get "null" in output for respective fields. Change-Id: I4e7f407592fa071abdab1d979775f46ec27dc9d2
-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 9b8b0ac..46fa114 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;
}