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

2014-07-31 03:52:14 +00:00
parent 8224edb94f 1df4d9f8c7
commit 905fe15ea0
1 changed files with 4 additions and 0 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1705,6 +1705,10 @@ final class ActivityStack {
            boolean startIt = true;
            for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
                task = mTaskHistory.get(taskNdx);
+                if (task.getTopActivity() == null) {
+                    // All activities in task are finishing.
+                    continue;
+                }
                if (task == r.task) {
                    // Here it is!  Now, if this is not yet visible to the
                    // user, then just add it without starting; it will