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

Commit 486ba92b authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Avoid deadlock during boot up" into rvc-qpr-dev

parents 89f122ab a312f816

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+2 −11
Original line number Diff line number Diff line
@@ -5359,15 +5359,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        return mAmInternal.isBackgroundActivityStartsEnabled();

    }



    void enableScreenAfterBoot(boolean booted) {

        writeBootProgressEnableScreen(SystemClock.uptimeMillis());

        mWindowManager.enableScreenAfterBoot();



        synchronized (mGlobalLock) {

            updateEventDispatchingLocked(booted);

        }

    }



    static long getInputDispatchingTimeoutLocked(ActivityRecord r) {

        if (r == null || !r.hasProcess()) {

            return KEY_DISPATCHING_TIMEOUT_MS;
@@ -6453,9 +6444,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


        @Override

        public void enableScreenAfterBoot(boolean booted) {

            synchronized (mGlobalLock) {

            writeBootProgressEnableScreen(SystemClock.uptimeMillis());

            mWindowManager.enableScreenAfterBoot();

            synchronized (mGlobalLock) {

                updateEventDispatchingLocked(booted);

            }

        }