diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-02 07:55:02 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-12-02 07:55:06 -0800 |
| commit | 40eade14bb87d24903588de04449fdfe2e1795cb (patch) | |
| tree | 22cf7f66ad807234c28cf352552e9a7e50cfb5ad /cmds | |
| parent | 077bc4ac019ad33abd613448e11d3ad501218991 (diff) | |
| parent | e1de3f390e7be3f82fa5e3e5bf6d6c8cc8414091 (diff) | |
| download | frameworks_base-40eade14bb87d24903588de04449fdfe2e1795cb.zip frameworks_base-40eade14bb87d24903588de04449fdfe2e1795cb.tar.gz frameworks_base-40eade14bb87d24903588de04449fdfe2e1795cb.tar.bz2 | |
Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
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; } |