Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ff6d010 authored by Craig Mautner's avatar Craig Mautner
Browse files

Be less aggressive when not resuming top activity 

The previous fix for keeping activities from running on startup,
ag/363992, was keeping the home task from launching when the
keyguard should have allowed it.

This fix permits the home activity to launch in such situations.

Fixes bug 10916877.

Change-Id: I429f0d5a13e06a247b9b6b7241f9a3514044c371
parent 254f5ffc

services/java/com/android/server/am/ActivityStack.java

+3 −6
Original line number Diff line number Diff line
@@ -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();