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

am fee88fdb: Merge "Issue: Foreground activity performs [Resume] and [Pause] when any process died in sleep mode."

Browse Source 
* commit 'fee88fdb64cd6c0a51b11426e28a1484390d473b':
  Issue: Foreground activity performs [Resume] and [Pause] when any process died in sleep mode.
This commit is contained in:
Dianne Hackborn
2012-04-21 00:55:26 -07:00
committed by Android Git Automerger
parent 5a3370e524 fee88fdb64
commit 78e621118a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/am/ActivityStack.java Normal file → Executable file
View File

@@ -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();