diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-02-23 09:24:42 -0800 |
|---|---|---|
| committer | Wale Ogunwale <ogunwale@google.com> | 2015-02-23 09:24:42 -0800 |
| commit | 49853bf1dfb1cc1ee19e56e457c36e65b5dfdd59 (patch) | |
| tree | ee962e3e0e6b0da58f98c5495f09870036cbc513 /services/core | |
| parent | 3c8fde83e42a896cb6670164f957c82ea918897a (diff) | |
| download | frameworks_base-49853bf1dfb1cc1ee19e56e457c36e65b5dfdd59.zip frameworks_base-49853bf1dfb1cc1ee19e56e457c36e65b5dfdd59.tar.gz frameworks_base-49853bf1dfb1cc1ee19e56e457c36e65b5dfdd59.tar.bz2 | |
Don't delete home stack when last task is removed.
Bug: 19470291
Change-Id: I4a6c24edb6cc83a0f155836ce4e1394807da1563
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 7afe23a..83a7b68 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -4162,14 +4162,17 @@ final class ActivityStack { if (mTaskHistory.isEmpty()) { if (DEBUG_STACK) Slog.i(TAG, "removeTask: moving to back stack=" + this); + final boolean notHomeStack = !isHomeStack(); if (isOnHomeDisplay()) { - mStackSupervisor.moveHomeStack(!isHomeStack(), reason + " leftTaskHistoryEmpty"); + mStackSupervisor.moveHomeStack(notHomeStack, reason + " leftTaskHistoryEmpty"); } if (mStacks != null) { mStacks.remove(this); mStacks.add(0, this); } - mActivityContainer.onTaskListEmptyLocked(); + if (notHomeStack) { + mActivityContainer.onTaskListEmptyLocked(); + } } task.stack = null; |