Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50a9cee6 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Filter package visibility in getPermissionGroupInfo()." into sc-dev am: 0833b471 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14333533

Change-Id: I9a8e6a304eb4eb0ebf470fa90924295e32e3e727
parents a4f65b96 0833b471

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

+16 −2
Original line number Diff line number Diff line
@@ -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;

    }