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

am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev

Browse Source 
* commit '24ba3234caa27185aa34aab5b88190f85f9a8d75':
  Do not delete stacks that are not empty.
This commit is contained in:
Craig Mautner
2013-10-21 21:34:59 -07:00
committed by Android Git Automerger
parent c024edfb08 24ba3234ca
commit 0857e3b97a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/am/ActivityRecord.java
View File

@@ -480,7 +480,12 @@ final class ActivityRecord {
void setTask(TaskRecord newTask, ThumbnailHolder newThumbHolder, boolean isRoot) {
if (task != null && task.removeActivity(this)) {
mStackSupervisor.removeTask(task);
if (task != newTask) {
mStackSupervisor.removeTask(task);
} else {
Slog.d(TAG, "!!! REMOVE THIS LOG !!! setTask: nearly removed stack=" +
(newTask == null ? null : newTask.stack));
}
}
if (inHistory && !finishing) {
if (task != null) {