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

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

Browse Source 
* commit '443d1a6ae3b9550a4a1b46926b336c1a534db2f4':
  [ActivityManager] Reset ActivityRecord's waitingVisible
This commit is contained in:
Craig Mautner
2014-12-29 01:56:42 +00:00
committed by Android Git Automerger
parent bbe3087ec0 443d1a6ae3
commit 3551ce9d8e
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

@@ -1567,6 +1567,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);
@@ -2776,6 +2777,7 @@ final class ActivityStack {
mStackSupervisor.mStoppingActivities.remove(r);
mStackSupervisor.mGoingToSleepActivities.remove(r);
mStackSupervisor.mWaitingVisibleActivities.remove(r);
r.waitingVisible = false;
if (mResumedActivity == r) {
mResumedActivity = null;
}
@@ -2977,6 +2979,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) {