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

Commit 33cc568e 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 

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



Change-Id: I4d0fb77a114a7c0664d455ee8ec940b8f65bdb47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f5b48bd c5f4d1e2

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