diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 88357bbd0029..8c9e399ed81d 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1199,6 +1199,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai * process of going to sleep (checkReadyForSleep will be called when that process finishes). */ boolean goToSleepIfPossible(boolean shuttingDown) { + final ActivityRecord topActivity = topActivity(); boolean shouldSleep = true; if (mResumedActivity != null) { @@ -1223,10 +1224,10 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai // Still waiting for something to pause; can't sleep yet. if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still waiting to pause " + mPausingActivity); 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 // state. - stopActivityLocked(mLastPausedActivity); + stopActivityLocked(topActivity); shouldSleep = false; } |