commit 66e16856ac874babd1156857cff281085a9a6732
author Wale Ogunwale <ogunwale@google.com> Thu Oct 19 13:35:52 2017 -0700
committer Wale Ogunwale <ogunwale@google.com> Tue Oct 24 11:31:59 2017 -0700
tree 95d05a1b8da70fccb38501b28373f1d851019d48
parent 7e1f5f56f8f3453f62183fd36df843a1a4e2ee12

taskReturnToType be gone!

The activity hierarchy now maintains visual ordering since most task
have their own stack, so no need for taskReturnToType complexity.
Also, we handle the API FLAG_ACTIVITY_TASK_ON_HOME by moving the
home stack forward whenever a stack with the root task intent with
that flag is movedToFront.

Bug: 64146578
Fixes: 67931573
Test: go/wm-smoke
Test: Existing test pass.
Change-Id: I465df9cb55830ac27bba330b221f730c6f1e9450

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

diff --git a/services/core/java/com/android/server/am/LockTaskController.java b/services/core/java/com/android/server/am/LockTaskController.java
index 1c094c1..11daf3f 100644
--- a/services/core/java/com/android/server/am/LockTaskController.java
+++ b/services/core/java/com/android/server/am/LockTaskController.java
@@ -430,7 +430,7 @@
         }
 
         if (andResume) {
-            mSupervisor.findTaskToMoveToFrontLocked(task, 0, null, reason,
+            mSupervisor.findTaskToMoveToFront(task, 0, null, reason,
                     lockTaskModeState != LOCK_TASK_MODE_NONE);
             mSupervisor.resumeFocusedStackTopActivityLocked();
             mWindowManager.executeAppTransition();