Merge "Filter package visibility in getAllPermissionGroups()." into sc-dev
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index a1fa586..884bbea 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -498,13 +498,18 @@
if (mPackageManagerInt.getInstantAppPackageName(callingUid) != null) {
return ParceledListSlice.emptyList();
}
+
+ final List<PermissionGroupInfo> out = new ArrayList<>();
synchronized (mLock) {
- final List<PermissionGroupInfo> out = new ArrayList<>();
for (ParsedPermissionGroup pg : mRegistry.getPermissionGroups()) {
out.add(PackageInfoUtils.generatePermissionGroupInfo(pg, flags));
}
- return new ParceledListSlice<>(out);
}
+
+ final int callingUserId = UserHandle.getUserId(callingUid);
+ out.removeIf(it -> mPackageManagerInt.filterAppAccess(it.packageName, callingUid,
+ callingUserId));
+ return new ParceledListSlice<>(out);
}