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

Merge "[ActivityManager] Avoid mistaking visibility by finishing task."

Browse Source
This commit is contained in:
Craig Mautner
2014-07-31 03:52:14 +00:00
committed by Gerrit Code Review
parent 8224edb94f 1df4d9f8c7
commit 905fe15ea0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java Executable file → Normal file
View File

@@ -1705,6 +1705,10 @@ final class ActivityStack {
boolean startIt = true; boolean startIt = true;
for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) { for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
task = mTaskHistory.get(taskNdx); task = mTaskHistory.get(taskNdx);
if (task.getTopActivity() == null) {
// All activities in task are finishing.
continue;
}
if (task == r.task) { if (task == r.task) {
// Here it is! Now, if this is not yet visible to the // Here it is! Now, if this is not yet visible to the
// user, then just add it without starting; it will // user, then just add it without starting; it will