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

am 22e4a1b8: am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev

Browse Source 
* commit '22e4a1b8e5ca72988bbdd7da2b7fe38f53d85c26':
  Only return to home if the foreground task is removed.
This commit is contained in:
Craig Mautner
2013-10-12 18:46:05 -07:00
committed by Android Git Automerger
parent ff98feec6f 22e4a1b8e5
commit 3e9230d42f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -2628,10 +2628,10 @@ final class ActivityStack {
if (task != null && task.removeActivity(r)) {
if (DEBUG_STACK) Slog.i(TAG,
"removeActivityFromHistoryLocked: last activity removed from " + this);
mStackSupervisor.removeTask(task);
if (task.mOnTopOfHome) {
if (task == topTask() && task.mOnTopOfHome) {
mStackSupervisor.moveHomeToTop();
}
mStackSupervisor.removeTask(task);
}
r.takeFromHistory();
removeTimeoutsForActivityLocked(r);