commit 6ccaf9061a66fad57becec3d4d68ddce330563f6
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 31 03:38:34 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 03:38:39 2017 +0000
tree c24418605e96a3506f28e68e2f7eaf78b86f1c2d
parent 817e838b1681ac0756b14dd9a9402ab94b3ba4af
parent 0e2056057bc53d75fb48a30e0ec996e27f68f7cc

Merge "Fixes starting app in docked stack for cts tests" into oc-dev

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

diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index 9258539..e9b3e8d 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -966,7 +966,7 @@
             mService.mWindowManager.continueSurfaceLayout();
         }
 
-        postStartActivityProcessing(r, result, mSupervisor.mFocusedStack.mStackId,  mSourceRecord,
+        postStartActivityProcessing(r, result, mSupervisor.getLastStack().mStackId,  mSourceRecord,
                 mTargetStack);
 
         return result;