| commit | d95b534ab3bcc9248d522777eea052fb0b044065 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Oct 18 15:20:20 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 18 15:20:20 2024 +0000 |
| tree | a236aaa94f531b400bc6bcbee5494686e128b296 | |
| parent | 89f4de36622f491f4a5c64ef2b24a9bdad099cb8 [diff] | |
| parent | 33cc568e4e2ab621cb82ca9a1692fc8de19a7f92 [diff] |
Merge "Fix the wrong light doze state check" into main am: c5f4d1e206 am: 33cc568e4e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3276773 Change-Id: I735154e1cbac994f00e232c55facedce976c0ac1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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();