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

am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev

Browse Source 
* commit '8488f9fa2e38e75e7ecbaac7d776900f8f1e5917':
  Be less aggressive when not resuming top activity
This commit is contained in:
Craig Mautner
2013-09-24 17:31:57 -07:00
committed by Android Git Automerger
parent 6dda4984cf 8488f9fa2e
commit f77c1eb1e0
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/am/ActivityStack.java
View File

@@ -1190,10 +1190,6 @@ final class ActivityStack {
}
final boolean resumeTopActivityLocked(ActivityRecord prev, Bundle options) {
if (mService.mLockScreenState == ActivityManagerService.LOCK_SCREEN_FIRST_SHOWN) {
return false;
}
// Find the first activity that is not finishing.
ActivityRecord next = topRunningActivityLocked(null);
@@ -1255,9 +1251,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.isSleepingOrShuttingDown())
if (mService.mLockScreenState == ActivityManagerService.LOCK_SCREEN_FIRST_SHOWN ||
(mService.isSleepingOrShuttingDown()
&& mLastPausedActivity == next
&& mStackSupervisor.allPausedActivitiesComplete()) {
&& mStackSupervisor.allPausedActivitiesComplete())) {
// Make sure we have executed any pending transitions, since there
// should be nothing left to do at this point.
mWindowManager.executeAppTransition();