diff options
author | Dianne Hackborn <hackbod@android.com> | 2012-04-21 00:57:43 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-21 00:57:43 -0700 |
commit | b3a766600275a004dfa2423e87229082d7f1232b (patch) | |
tree | 6c3f7eb7f5de4f9c0824cc2f991bf9aca30af601 | |
parent | 27e1680b5cd3694029ddac4128050b17f59f235e (diff) | |
parent | 78e621118a0648a8720cb322e82d1694c78e3d1a (diff) | |
download | frameworks_base-b3a766600275a004dfa2423e87229082d7f1232b.zip frameworks_base-b3a766600275a004dfa2423e87229082d7f1232b.tar.gz frameworks_base-b3a766600275a004dfa2423e87229082d7f1232b.tar.bz2 |
am 78e62111: am fee88fdb: Merge "Issue: Foreground activity performs [Resume] and [Pause] when any process died in sleep mode."
* commit '78e621118a0648a8720cb322e82d1694c78e3d1a':
Issue: Foreground activity performs [Resume] and [Pause] when any process died in sleep mode.
-rwxr-xr-x[-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..100755 --- 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(); |