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

Merge "Update reference to top activity." into oc-mr1-dev

Browse Source 
am: f35bfc3d0c

Change-Id: Idd809abedb4e0a63bca117cdb6ce7ec89b6fa64a
This commit is contained in:
Bryce Lee
2017-09-14 01:22:56 +00:00
committed by android-build-merger
parent eec8e457be f35bfc3d0c
commit c8aa54117f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1190,6 +1190,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
* process of going to sleep (checkReadyForSleep will be called when that process finishes). * process of going to sleep (checkReadyForSleep will be called when that process finishes).
*/ */
boolean goToSleepIfPossible(boolean shuttingDown) { boolean goToSleepIfPossible(boolean shuttingDown) {
final ActivityRecord topActivity = topActivity();
boolean shouldSleep = true; boolean shouldSleep = true;
if (mResumedActivity != null) { if (mResumedActivity != null) {
@@ -1214,10 +1215,10 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
// Still waiting for something to pause; can't sleep yet. // Still waiting for something to pause; can't sleep yet.
if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still waiting to pause " + mPausingActivity); if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still waiting to pause " + mPausingActivity);
shouldSleep = false; shouldSleep = false;
} else if (topActivity() != null && topActivity().state == ActivityState.PAUSED) { } else if (topActivity != null && topActivity.state == ActivityState.PAUSED) {
// Our top activity is currently paused, we need to ensure we move it to the stopped // Our top activity is currently paused, we need to ensure we move it to the stopped
// state. // state.
stopActivityLocked(mLastPausedActivity); stopActivityLocked(topActivity);
shouldSleep = false; shouldSleep = false;
} }