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

am: 6ccaf9061a Change-Id: I9e5f6139731b043eb48e2fe6b68b23a754d14d68
2017-03-31 03:44:41 +00:00
parent 4c3ec5a0d8 6ccaf9061a
commit 18d38be88d
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -966,7 +966,7 @@ class ActivityStarter {
            mService.mWindowManager.continueSurfaceLayout();
        }

-        postStartActivityProcessing(r, result, mSupervisor.mFocusedStack.mStackId,  mSourceRecord,
+        postStartActivityProcessing(r, result, mSupervisor.getLastStack().mStackId,  mSourceRecord,
                mTargetStack);

        return result;