diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-29 01:30:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-29 01:30:50 +0000 |
| commit | cfa31a605cda26a556009ddd4eae83085e74339b (patch) | |
| tree | 66aac18e90a5f9cd527ed81f312754e7703c70c5 | |
| parent | ee435b16d89ee9cb65eead9ac7507693342c15b3 (diff) | |
| parent | 1110f5547018030c316562b217a073b16364ed51 (diff) | |
| download | frameworks_base-cfa31a605cda26a556009ddd4eae83085e74339b.zip frameworks_base-cfa31a605cda26a556009ddd4eae83085e74339b.tar.gz frameworks_base-cfa31a605cda26a556009ddd4eae83085e74339b.tar.bz2 | |
Merge "[ActivityManager] Reset ActivityRecord's waitingVisible"
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 0c23e58..c03dbc2 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1595,6 +1595,7 @@ final class ActivityStack { mStackSupervisor.mGoingToSleepActivities.remove(next); next.sleeping = false; mStackSupervisor.mWaitingVisibleActivities.remove(next); + next.waitingVisible = false; if (DEBUG_SWITCH) Slog.v(TAG, "Resuming " + next); @@ -2807,6 +2808,7 @@ final class ActivityStack { mStackSupervisor.mStoppingActivities.remove(r); mStackSupervisor.mGoingToSleepActivities.remove(r); mStackSupervisor.mWaitingVisibleActivities.remove(r); + r.waitingVisible = false; if (mResumedActivity == r) { mResumedActivity = null; } @@ -3007,6 +3009,7 @@ final class ActivityStack { // down to the max limit while they are still waiting to finish. mStackSupervisor.mFinishingActivities.remove(r); mStackSupervisor.mWaitingVisibleActivities.remove(r); + r.waitingVisible = false; // Remove any pending results. if (r.finishing && r.pendingResults != null) { |