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

Commit 6ad6ca89 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Filter package visibility in getAllPermissionGroups()." into sc-dev am: 9443a3e8 

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

Change-Id: I108554a117a485bfce9439fa5f7247d5341bd4d7
parents 50a9cee6 9443a3e8

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

+7 −2
Original line number Diff line number Diff line
@@ -498,13 +498,18 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
        if (mPackageManagerInt.getInstantAppPackageName(callingUid) != null) {

            return ParceledListSlice.emptyList();

        }

        synchronized (mLock) {



        final List<PermissionGroupInfo> out = new ArrayList<>();

        synchronized (mLock) {

            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);

    }