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

Commit d95b534a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the wrong light doze state check" into main am: c5f4d1e2 am: 33cc568e 

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



Change-Id: I735154e1cbac994f00e232c55facedce976c0ac1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89f4de36 33cc568e

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+1 −1
Original line number Diff line number Diff line
@@ -3568,7 +3568,7 @@ public class DeviceIdleController extends SystemService 
            Slog.i(TAG, "becomeActiveLocked, reason=" + activeReason

                    + ", changeLightIdle=" + changeLightIdle);

        }

        if (mState != STATE_ACTIVE || mLightState != STATE_ACTIVE) {

        if (mState != STATE_ACTIVE || mLightState != LIGHT_STATE_ACTIVE) {

            moveToStateLocked(STATE_ACTIVE, activeReason);

            mInactiveTimeout = newInactiveTimeout;

            resetIdleManagementLocked();