diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-29 11:13:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-29 11:13:22 +0000 |
| commit | 1cc57aba8128134f55b6d5e4f4800c51e3472828 (patch) | |
| tree | e4339a0e0618ec85a6c7ad39fc6ef1f23be66741 /cmds/pm | |
| parent | 7e6ae353f022426d52df77acca4d0ded58b939b5 (diff) | |
| parent | 1bafd01a3fc5f94e77d1c18e5a7dcdecddcaa47f (diff) | |
| download | frameworks_base-1cc57aba8128134f55b6d5e4f4800c51e3472828.zip frameworks_base-1cc57aba8128134f55b6d5e4f4800c51e3472828.tar.gz frameworks_base-1cc57aba8128134f55b6d5e4f4800c51e3472828.tar.bz2 | |
am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"
* commit '1bafd01a3fc5f94e77d1c18e5a7dcdecddcaa47f':
Fix "pm list permissions" crash if resource string missing
Diffstat (limited to 'cmds/pm')
| -rw-r--r-- | cmds/pm/src/com/android/commands/pm/Pm.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java index 7fd586f..dfe1fce 100644 --- a/cmds/pm/src/com/android/commands/pm/Pm.java +++ b/cmds/pm/src/com/android/commands/pm/Pm.java @@ -549,7 +549,10 @@ public final class Pm { if (res != 0) { Resources r = getResources(pii); if (r != null) { - return r.getString(res); + try { + return r.getString(res); + } catch (Resources.NotFoundException e) { + } } } return null; |