From 2c924fb2c7dfba69d2913943598cbc61945d4f1d Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 29 Aug 2014 13:02:03 -0700
Subject: [PATCH] Fix issue #17329066: Crash in ActivityManager

Change-Id: Ib59b7a8d65b3abece82bc58897e21600af4d73f5
---
 .../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 1d2f7a9976a63..654513400e640 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2072,7 +2072,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
             }
             targetStack = inTask.stack;
             targetStack.moveTaskToFrontLocked(inTask, r, options);
-            mWindowManager.moveTaskToTop(targetStack.topTask().taskId);
+            mWindowManager.moveTaskToTop(inTask.taskId);
 
             // Check whether we should actually launch the new activity in to the task,
             // or just reuse the current activity on top.