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

Commit 84402777 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 9a4afb3f: am c3e7f87b: Merge "Fix issue #17740687: Device does not boot... 

am 9a4afb3f: am c3e7f87b: Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev

* commit '9a4afb3f':
  Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
parents 5f243860 9a4afb3f

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+7 −6
Original line number Original line Diff line number Diff line
@@ -2243,11 +2243,15 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            r.idle = true;

            r.idle = true;





            //Slog.i(TAG, "IDLE: mBooted=" + mBooted + ", fromTimeout=" + fromTimeout);

            //Slog.i(TAG, "IDLE: mBooted=" + mBooted + ", fromTimeout=" + fromTimeout);

            if (!mService.mBooted && isFrontStack(r.task.stack)) {

            if (isFrontStack(r.task.stack) || fromTimeout) {

                booting = mService.mBooting;

                mService.mBooting = false;

                if (!mService.mBooted) {

                    mService.mBooted = true;

                    mService.mBooted = true;

                    enableScreen = true;

                    enableScreen = true;

                }

                }

            }

            }

        }





        if (allResumedActivitiesIdle()) {

        if (allResumedActivitiesIdle()) {

            if (r != null) {

            if (r != null) {
@@ -2273,9 +2277,6 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            mFinishingActivities.clear();

            mFinishingActivities.clear();

        }

        }





        booting = mService.mBooting;

        mService.mBooting = false;



        if (mStartingUsers.size() > 0) {

        if (mStartingUsers.size() > 0) {

            startingUsers = new ArrayList<UserStartedState>(mStartingUsers);

            startingUsers = new ArrayList<UserStartedState>(mStartingUsers);

            mStartingUsers.clear();

            mStartingUsers.clear();