From 9ba8d36aaa0a5197508f52c7d85162f8fc99087a Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Mon, 16 May 2022 13:03:19 +0800 Subject: [PATCH] Fix NPE in queryPermissionsByGroup It's possible that the given groupName is null. We should handle this normal case. Fix: 232566949 Test: manually verify with 'pm list permissions'. Change-Id: I267fa62d2d46818c5a41363ebdafb66d59309c25 --- .../server/pm/permission/PermissionManagerServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index ef2f2e93e5db7..535c85eed3c63 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -593,8 +593,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,