Merge "Filter package visibility in queryPermissionsByGroup()." into sc-dev (e0236751) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -564,18 +564,23 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		if (mPackageManagerInt.getInstantAppPackageName(callingUid) != null) {
		return null;
		}

		final List<PermissionInfo> out = new ArrayList<>(10);
		synchronized (mLock) {
		if (groupName != null && mRegistry.getPermissionGroup(groupName) == null) {
		return null;
		}
		final ArrayList<PermissionInfo> out = new ArrayList<PermissionInfo>(10);
		for (Permission bp : mRegistry.getPermissions()) {
		if (Objects.equals(bp.getGroup(), groupName)) {
		out.add(bp.generatePermissionInfo(flags));
		}
		}
		return new ParceledListSlice<>(out);
		}

		final int callingUserId = UserHandle.getUserId(callingUid);
		out.removeIf(it -> mPackageManagerInt.filterAppAccess(it.packageName, callingUid,
		callingUserId));
		return new ParceledListSlice<>(out);
		}

		@Override