From abcc59c32fd67c507f2ff192e82fef971968b2db Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Sat, 17 May 2014 15:13:28 -0700 Subject: [PATCH] Pass correct task to window manager The target task when starting is not always the top task. If it's not the window manager gets into a bad state. Fixes bug 14684143. Change-Id: I90145ae43bdc5d980dc25ac19e12aa84debfed71 --- .../java/com/android/server/am/ActivityStackSupervisor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 6f62a030b67c3..ede7cdb777538 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -1818,7 +1818,7 @@ public final class ActivityStackSupervisor implements DisplayListener { } targetStack = sourceTask.stack; targetStack.moveToFront(); - mWindowManager.moveTaskToTop(sourceTask.taskId); + mWindowManager.moveTaskToTop(targetStack.topTask().taskId); if (!addingToTask && (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) { // In this case, we are adding the activity to an existing