diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-13 18:15:00 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2013-10-14 02:20:57 +0000 |
| commit | e1db0dd089456d80a2872fe1a12a179f39240aec (patch) | |
| tree | 8a7658469baca32ad4b6da45880d1791453ab9bc /services/java/com/android/server/am | |
| parent | 5db566f16a1b8f36e84a9be00cde40482d48466b (diff) | |
| download | frameworks_base-e1db0dd089456d80a2872fe1a12a179f39240aec.zip frameworks_base-e1db0dd089456d80a2872fe1a12a179f39240aec.tar.gz frameworks_base-e1db0dd089456d80a2872fe1a12a179f39240aec.tar.bz2 | |
Test for task in front must include stack in front.
The CL that ensured that a dying task must be in front of the user
(ag/374996) only checked that the task was at the top of /a/ stack,
not on top of the frontmost stack. This checks the stack for being
frontmost before switching to home.
Fixes bug 11208762.
Change-Id: I43f6d380e7a880ec19db03711ada6c7437e15f73
Diffstat (limited to 'services/java/com/android/server/am')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index d1c313a..20d443b 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -2628,7 +2628,7 @@ final class ActivityStack { if (task != null && task.removeActivity(r)) { if (DEBUG_STACK) Slog.i(TAG, "removeActivityFromHistoryLocked: last activity removed from " + this); - if (task == topTask() && task.mOnTopOfHome) { + if (mStackSupervisor.isFrontStack(this) && task == topTask() && task.mOnTopOfHome) { mStackSupervisor.moveHomeToTop(); } mStackSupervisor.removeTask(task); |