Merge "Fix NPE in queryPermissionsByGroup"

2022-05-16 09:46:57 +00:00
parent 0ffeb9641b 9ba8d36aaa
commit 335c63b253
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -624,8 +624,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
        }

        final int callingUserId = UserHandle.getUserId(callingUid);
-        if (mPackageManagerInt.filterAppAccess(permissionGroup.getPackageName(), callingUid,
-                callingUserId)) {
+        if (permissionGroup != null && mPackageManagerInt.filterAppAccess(
+                permissionGroup.getPackageName(), callingUid, callingUserId)) {
            return null;
        }
        out.removeIf(it -> mPackageManagerInt.filterAppAccess(it.packageName, callingUid,