am 905fe15e: Merge "[ActivityManager] Avoid mistaking visibility by finishing task."

* commit '905fe15ea09238ed132ccd347e078892b6b49ddf':
  [ActivityManager] Avoid mistaking visibility by finishing task.
This commit is contained in:
Craig Mautner
2014-07-31 03:57:33 +00:00
committed by Android Git Automerger

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;
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