diff options
| author | 2022-04-04 21:30:07 +0000 | |
|---|---|---|
| committer | 2022-04-04 21:30:07 +0000 | |
| commit | 29a39d8de0d3fd3b7af10c3f974fa1383fac11c3 (patch) | |
| tree | f9580ea83348f47658f4a1630923584b0b2fbbe6 | |
| parent | ae925af047b6df3069324017f027e69240aa9e14 (diff) | |
| parent | 7b763b6a427ea0efdbdd289268d06692efdd2e31 (diff) | |
Merge "Handle non-exist permission group correctly for pm list permissions" am: 6887292748 am: 627ff7fd80 am: 7b763b6a42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734914
Change-Id: If23120353bcfeda2558e0823e45fa5c0338fb8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerShellCommand.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index e142ed631092..d6ab78bd27ea 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -3694,7 +3694,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); |