am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front.

* commit 'd3b2fa49492cfe0ee81f0a66887d1e79d3bf0d2d':
  Test for task in front must include stack in front.
This commit is contained in:
Craig Mautner
2013-10-13 19:26:52 -07:00
committed by Android Git Automerger

View File

@@ -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);