drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"

Browse Source 
* commit '44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a':
  Fix "pm list permissions" crash if resource string missing
This commit is contained in:
Narayan Kamath
2014-12-29 11:06:53 +00:00
committed by Android Git Automerger
parent 7d019394f7 44a5a30a61
commit 1bafd01a3f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/pm/src/com/android/commands/pm/Pm.java
View File

@ -563,7 +563,10 @@ public final class Pm {
if (res != 0) { if (res != 0) {
Resources r = getResources(pii); Resources r = getResources(pii);
if (r != null) { if (r != null) {
try {
return r.getString(res); return r.getString(res);
} catch (Resources.NotFoundException e) {
}
} }
} }
return null; return null;