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

Commit 1d609047 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove double-locking from PowerManagerService.onBootPhase" into tm-dev

parents cab5bb21 8c6a02a4

services/core/java/com/android/server/power/PowerManagerService.java

+6 −6
Original line number Diff line number Diff line
@@ -1176,7 +1176,6 @@ public final class PowerManagerService extends SystemService 


    @Override

    public void onBootPhase(int phase) {

        synchronized (mLock) {

        if (phase == PHASE_SYSTEM_SERVICES_READY) {

            systemReady();
@@ -1184,6 +1183,7 @@ public final class PowerManagerService extends SystemService 
            incrementBootCount();



        } else if (phase == PHASE_BOOT_COMPLETED) {

            synchronized (mLock) {

                final long now = mClock.uptimeMillis();

                mBootCompleted = true;

                mDirty |= DIRTY_BOOT_COMPLETED;