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

Commit b265a0d3 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Avoid deadlock during boot up" into rvc-qpr-dev am: 486ba92b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343729

Change-Id: I760ea39d7635c69c8bee6444585a050a47c8838c
parents a822fb62 486ba92b

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

            }

        }