summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeun-young Park <keunyoung@google.com>2021-04-16 21:53:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-04-16 21:53:54 +0000
commitdeb3b21eb397b32b51b69993c2c67dd15fd55838 (patch)
tree72cd7ba977e80dfbb751153189d05d5d2b6f1a2c
parent577c2d88632c79ae073db685b9cd49c66c1a8eda (diff)
parent699cbd988cc4184af84049facb1da7271f799ef8 (diff)
Merge "Use caller's user id for recent caller info" into sc-dev
-rw-r--r--services/core/java/com/android/server/am/ActiveServices.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 4324717a7938..5a1a505d7aa8 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -3039,7 +3039,7 @@ public final class ActiveServices {
try {
r.mRecentCallerApplicationInfo =
mAm.mContext.getPackageManager().getApplicationInfoAsUser(callingPackage,
- 0, userId);
+ 0, UserHandle.getUserId(callingUid));
} catch (PackageManager.NameNotFoundException e) {
}
if (!mAm.validateAssociationAllowedLocked(callingPackage, callingUid, r.packageName,