diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-29 11:01:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-29 11:01:28 +0000 |
| commit | 44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a (patch) | |
| tree | 589959fe1eae3ac3e405d776845b485a22cb7336 /cmds/pm | |
| parent | 712a02050e7be4479f12a81aeb23d7217b8d7a8d (diff) | |
| parent | bf8b57af351ae9272b7490b373ca57b2a96e643a (diff) | |
| download | frameworks_base-44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a.zip frameworks_base-44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a.tar.gz frameworks_base-44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a.tar.bz2 | |
Merge "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 5e9d8f7..5249065 100644 --- a/cmds/pm/src/com/android/commands/pm/Pm.java +++ b/cmds/pm/src/com/android/commands/pm/Pm.java @@ -563,7 +563,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; |