From 0303f0b1bcb014d31728364969153c1e577053e2 Mon Sep 17 00:00:00 2001
From: utzcoz <utzcoz@gmail.com>
Date: Sat, 12 Jun 2021 19:24:43 +0800
Subject: [PATCH] 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>
---
 .../java/com/android/server/pm/PackageManagerShellCommand.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index 265e6062f1d60..d01f96214060c 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 @@ 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);