diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-01 09:47:14 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-12-01 09:47:14 -0800 |
| commit | e1de3f390e7be3f82fa5e3e5bf6d6c8cc8414091 (patch) | |
| tree | 1bac61bd7612d960a334b7ea19698ba0b2c32f1b /cmds | |
| parent | 6cbca108936d3be3acfef7d05af73230eacd9b8b (diff) | |
| parent | 1c3274ca12a6931568693b897c269107f0346eab (diff) | |
| download | frameworks_base-e1de3f390e7be3f82fa5e3e5bf6d6c8cc8414091.zip frameworks_base-e1de3f390e7be3f82fa5e3e5bf6d6c8cc8414091.tar.gz frameworks_base-e1de3f390e7be3f82fa5e3e5bf6d6c8cc8414091.tar.bz2 | |
Merge "Fix crash by "adb shell pm list permissions -f|-s""
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/pm/src/com/android/commands/pm/Pm.java | 8 |
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; } |