summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wale Ogunwale <ogunwale@google.com> 2015-10-12 18:04:05 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-10-12 18:04:05 +0000
commitb394e6de9be16994f04ca17c057269e9f9b35083 (patch)
tree6cd4d0f7162081d89108376df419c5ea9a55cbcd
parent46811dd9df0cbef68f69e938a52b418ba927882a (diff)
parent5c18d0517749cf2e65d19ea6bec938a4eb6c39e5 (diff)
am 5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode
* commit '5c18d0517749cf2e65d19ea6bec938a4eb6c39e5': Use effectiveUid instead of callingUid to set lockTaskMode
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 6d91309929fb..bf63931fe447 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3920,7 +3920,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
mLockTaskModeTasks.add(task);
if (task.mLockTaskUid == -1) {
- task.mLockTaskUid = task.mCallingUid;
+ task.mLockTaskUid = task.effectiveUid;
}
if (andResume) {