Merge "Handle non-exist permission group correctly for pm list permissions" am: 6887292748
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734914 Change-Id: Ibe788cb7146d2981ae44561c5887b6c644fe6a3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -3516,7 +3516,7 @@ class PackageManagerShellCommand extends ShellCommand {
|
||||
}
|
||||
List<PermissionInfo> ps = mPermissionManager
|
||||
.queryPermissionsByGroup(groupList.get(i), 0 /*flags*/);
|
||||
final int count = ps.size();
|
||||
final int count = (ps == null ? 0 : ps.size());
|
||||
boolean first = true;
|
||||
for (int p = 0 ; p < count ; p++) {
|
||||
PermissionInfo pi = ps.get(p);
|
||||
|
||||
Reference in New Issue
Block a user