commit 5c18d0517749cf2e65d19ea6bec938a4eb6c39e5
author Wale Ogunwale <ogunwale@google.com> Mon Oct 12 10:34:14 2015 -0700
committer Wale Ogunwale <ogunwale@google.com> Mon Oct 12 17:40:56 2015 +0000
tree dc892a6f5a8f25b4f99a541a2bd5b63f2bdfb77d
parent c4c42d55f0c1a4130da7e8f70a2338a4282b3ae5

Use effectiveUid instead of callingUid to set lockTaskMode

The callingUid can be different from that of the app been locked
(e.g. was launched from launcher) there by leading to the app crashing
when it tries to exit lockTaskMode.

Bug: 24146132
Change-Id: I03346fabd1d7e61b29178220c72f747a0600f5ec

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 6d91309..bf63931 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 @@
         mLockTaskModeTasks.add(task);
 
         if (task.mLockTaskUid == -1) {
-            task.mLockTaskUid = task.mCallingUid;
+            task.mLockTaskUid = task.effectiveUid;
         }
 
         if (andResume) {