Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 59a6a8a5: am aa631d9a: Merge "Fix issue #17329066: Crash in ActivityManager" into lmp-dev

Browse Source 
* commit '59a6a8a5081ca7670ae120ee9a4a66004f6bf0f5':
  Fix issue #17329066: Crash in ActivityManager
This commit is contained in:
Dianne Hackborn
2014-08-29 23:53:42 +00:00
committed by Android Git Automerger
parent d299fef90c 61c6e1bceb
commit 5c69d9403f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -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.