Merge "Filter package visibility in getPermissionGroupInfo()." into sc-dev

This commit is contained in:
Hai Zhang
2021-04-30 23:00:23 +00:00
committed by Android (Google) Code Review

View File

@@ -516,10 +516,24 @@ public class PermissionManagerService extends IPermissionManager.Stub {
if (mPackageManagerInt.getInstantAppPackageName(callingUid) != null) {
return null;
}
final PermissionGroupInfo permissionGroupInfo;
synchronized (mLock) {
return PackageInfoUtils.generatePermissionGroupInfo(
mRegistry.getPermissionGroup(groupName), flags);
final ParsedPermissionGroup permissionGroup = mRegistry.getPermissionGroup(groupName);
if (permissionGroup == null) {
return null;
}
permissionGroupInfo = PackageInfoUtils.generatePermissionGroupInfo(permissionGroup,
flags);
}
final int callingUserId = UserHandle.getUserId(callingUid);
if (mPackageManagerInt.filterAppAccess(permissionGroupInfo.packageName, callingUid,
callingUserId)) {
EventLog.writeEvent(0x534e4554, "186113473", callingUid, groupName);
return null;
}
return permissionGroupInfo;
}