commit 688729274871d2a70cc02ca0c6b89d7bb3b82ec6
author Songchun Fan <schfan@google.com> Mon Apr 04 20:08:13 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 04 20:08:13 2022 +0000
tree 51f3362039df9f465a3ddfae21a2257e3e589c37
parent d47a35e3a7010f3309710e1078fb3beac3092411
parent 0303f0b1bcb014d31728364969153c1e577053e2

Merge "Handle non-exist permission group correctly for pm list permissions"

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

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);