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

Commit 9cf2fdc4 authored by Stanislav Zholnin's avatar Stanislav Zholnin Committed by Automerger Merge Worker
Browse files

Merge "Make getHistoricalOps() properly handle multi-user functionality." into... 

Merge "Make getHistoricalOps() properly handle multi-user functionality." into sc-dev am: 0dd90806

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

Change-Id: Icbe87f3ff544227e600c9c1817fcc84d03e6f8fc
parents cffa73e6 0dd90806

services/core/java/com/android/server/appop/AppOpsService.java

+3 −2
Original line number Diff line number Diff line
@@ -2341,8 +2341,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
            boolean isCallerSystem = Binder.getCallingPid() == Process.myPid();

            boolean isCallerPermissionController;

            try {

                isCallerPermissionController = pm.getPackageUid(

                        mContext.getPackageManager().getPermissionControllerPackageName(), 0)

                isCallerPermissionController = pm.getPackageUidAsUser(

                        mContext.getPackageManager().getPermissionControllerPackageName(), 0,

                        UserHandle.getUserId(Binder.getCallingUid()))

                        == Binder.getCallingUid();

            } catch (PackageManager.NameNotFoundException doesNotHappen) {

                return;