diff options
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 351dbb8..86d3a1a 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -1314,7 +1314,10 @@ final class ActivityStack { // If we are sleeping, and there is no resumed activity, and the top // activity is paused, well that is the state we want. if ((mService.mSleeping || mService.mShuttingDown) - && mLastPausedActivity == next && next.state == ActivityState.PAUSED) { + && mLastPausedActivity == next + && (next.state == ActivityState.PAUSED + || next.state == ActivityState.STOPPED + || next.state == ActivityState.STOPPING)) { // Make sure we have executed any pending transitions, since there // should be nothing left to do at this point. mService.mWindowManager.executeAppTransition(); |