commit | 0303f0b1bcb014d31728364969153c1e577053e2 | [log] [tgz] |
---|---|---|
author | utzcoz <utzcoz@gmail.com> | Sat Jun 12 19:24:43 2021 +0800 |
committer | utzcoz <utzcoz@gmail.com> | Sun Apr 03 21:03:28 2022 +0800 |
tree | 060b821e012e3d07f8e598d6fa929db7991376c7 | |
parent | ebcfe1c6e04e02cc4e27be020268b392c502777f [diff] |
Handle non-exist permission group correctly for pm list permissions Test: adb shell pm list permissions non-exist-permission-group Change-Id: I4e1a36ec673c9b3cc813346f6fce79f5017a099a Signed-off-by: utzcoz <utzcoz@gmail.com>
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 265e606..d01f962 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -3516,7 +3516,7 @@ } 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);