Merge "Check if doze was forced before turning device active." into main (741f9d20) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -893,8 +893,9 @@ public class DeviceIdleController extends SystemService
		}
		// Fall through when quick doze is not requested.

		if (!mIsOffBody) {
		// Quick doze was not requested and device is on body so turn the device active.
		if (!mIsOffBody && !mForceIdle) {
		// Quick doze wasn't requested, doze wasn't forced and device is on body
		// so turn the device active.
		mActiveReason = ACTIVE_REASON_ONBODY;
		becomeActiveLocked("on_body", Process.myUid());
		}