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

am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"

Browse Source 
* commit 'cfa31a605cda26a556009ddd4eae83085e74339b':
  [ActivityManager] Reset ActivityRecord's waitingVisible
This commit is contained in:
Craig Mautner
2014-12-29 01:44:25 +00:00
committed by Android Git Automerger
parent f9f4195170 cfa31a605c
commit 443d1a6ae3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -1595,6 +1595,7 @@ final class ActivityStack {
mStackSupervisor.mGoingToSleepActivities.remove(next); mStackSupervisor.mGoingToSleepActivities.remove(next);
next.sleeping = false; next.sleeping = false;
mStackSupervisor.mWaitingVisibleActivities.remove(next); mStackSupervisor.mWaitingVisibleActivities.remove(next);
next.waitingVisible = false;
if (DEBUG_SWITCH) Slog.v(TAG, "Resuming " + next); if (DEBUG_SWITCH) Slog.v(TAG, "Resuming " + next);
@@ -2807,6 +2808,7 @@ final class ActivityStack {
mStackSupervisor.mStoppingActivities.remove(r); mStackSupervisor.mStoppingActivities.remove(r);
mStackSupervisor.mGoingToSleepActivities.remove(r); mStackSupervisor.mGoingToSleepActivities.remove(r);
mStackSupervisor.mWaitingVisibleActivities.remove(r); mStackSupervisor.mWaitingVisibleActivities.remove(r);
r.waitingVisible = false;
if (mResumedActivity == r) { if (mResumedActivity == r) {
mResumedActivity = null; mResumedActivity = null;
} }
@@ -3007,6 +3009,7 @@ final class ActivityStack {
// down to the max limit while they are still waiting to finish. // down to the max limit while they are still waiting to finish.
mStackSupervisor.mFinishingActivities.remove(r); mStackSupervisor.mFinishingActivities.remove(r);
mStackSupervisor.mWaitingVisibleActivities.remove(r); mStackSupervisor.mWaitingVisibleActivities.remove(r);
r.waitingVisible = false;
// Remove any pending results. // Remove any pending results.
if (r.finishing && r.pendingResults != null) { if (r.finishing && r.pendingResults != null) {