summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Patrick Baumann <patb@google.com> 2020-09-30 20:09:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-09-30 20:09:30 +0000
commit5e528338d1f25ef97f3fe0f3b3f2a947ca91ee97 (patch)
treeaca51f3bbda368088e03b8f77941f1519345bdae
parent5b4389d5e5402e41853bce143a2336417e185f78 (diff)
parent1bc593dc60e2eeffca2e50abe099eba379a4cdfa (diff)
Fixes PM.grantImplicitAccess for multi-user am: 7494002c94 am: 1bc593dc60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729198 Change-Id: I04b7d4a05e9614e0cc889353e8ef9e4043eb865f
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 1ae1681f6771..67f218e5110e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -25740,7 +25740,7 @@ public class PackageManagerService extends IPackageManager.Stub
// This API is exposed temporarily to only the contacts provider. (b/158688602)
final int callingUid = Binder.getCallingUid();
ProviderInfo contactsProvider = resolveContentProviderInternal(
- ContactsContract.AUTHORITY, 0, UserHandle.USER_SYSTEM);
+ ContactsContract.AUTHORITY, 0, UserHandle.getUserId(callingUid));
if (contactsProvider == null || contactsProvider.applicationInfo == null
|| !UserHandle.isSameApp(contactsProvider.applicationInfo.uid, callingUid)) {
throw new SecurityException(callingUid + " is not allow to call grantImplicitAccess");