Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle non-exist permission group correctly for pm list permissions" am: 6887292748 am: 627ff7fd80 am: 7b763b6a42 am: 29a39d8de0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734914

Change-Id: Ifbb70ddbb1ed2a2038b8c2b8d1bde599c18d4aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Songchun Fan
2022-04-04 21:50:39 +00:00
committed by Automerger Merge Worker
parent 698682b12e 29a39d8de0
commit 358657ffc3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -3694,7 +3694,7 @@ class PackageManagerShellCommand extends ShellCommand {
} }
List<PermissionInfo> ps = mPermissionManager List<PermissionInfo> ps = mPermissionManager
.queryPermissionsByGroup(groupList.get(i), 0 /*flags*/); .queryPermissionsByGroup(groupList.get(i), 0 /*flags*/);
final int count = ps.size(); final int count = (ps == null ? 0 : ps.size());
boolean first = true; boolean first = true;
for (int p = 0 ; p < count ; p++) { for (int p = 0 ; p < count ; p++) {
PermissionInfo pi = ps.get(p); PermissionInfo pi = ps.get(p);