Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I4aae69fc086de9b552e8cf9953db90ae28d22d0f
This commit is contained in:
Stanislav Zholnin
2021-06-29 09:12:35 +00:00
committed by Automerger Merge Worker
parent 6eb63ef6a1 0dd908063e
commit 403c0f8fbc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -2341,8 +2341,9 @@ public class AppOpsService extends IAppOpsService.Stub {
boolean isCallerSystem = Binder.getCallingPid() == Process.myPid(); boolean isCallerSystem = Binder.getCallingPid() == Process.myPid();
boolean isCallerPermissionController; boolean isCallerPermissionController;
try { try {
isCallerPermissionController = pm.getPackageUid( isCallerPermissionController = pm.getPackageUidAsUser(
mContext.getPackageManager().getPermissionControllerPackageName(), 0) mContext.getPackageManager().getPermissionControllerPackageName(), 0,
UserHandle.getUserId(Binder.getCallingUid()))
== Binder.getCallingUid(); == Binder.getCallingUid();
} catch (PackageManager.NameNotFoundException doesNotHappen) { } catch (PackageManager.NameNotFoundException doesNotHappen) {
return; return;