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

Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev

Browse Source
This commit is contained in:
Bryce Lee
2017-09-08 20:56:52 +00:00
committed by Android (Google) Code Review
parent b98eeb2552 01cffc296b
commit f243b1f40b
1 changed files with 5 additions and 0 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

@@ -1214,6 +1214,11 @@ 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 (mLastPausedActivity == topActivity()) {
// Our top activity is currently paused, we need to ensure we move it to the stopped
// state.
stopActivityLocked(mLastPausedActivity);
shouldSleep = false;
} }
if (!shuttingDown) { if (!shuttingDown) {