commit c5f4d1e206f5a707e050817fea04a6d78bfc4d52
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Oct 18 14:34:05 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 18 14:34:05 2024 +0000
tree 889205266825676d3f9f4c98ef4611f506c52790
parent e4942e474953f07fd4620ee6f1448500e65fa2d3
parent 10a403190c6b852ccd090e9e684bca9bba55c493

Merge "Fix the wrong light doze state check" into main

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

diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
index c1894f0..a37779e 100644
--- a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
+++ b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
@@ -3568,7 +3568,7 @@
             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();