Merge "Merge Android 12 QPR1" (85d715ba) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -2918,6 +2918,13 @@ public class DeviceIdleController extends SystemService
		reasonCode, reason).sendToTarget();
		}
		reportTempWhitelistChangedLocked(uid, true);
		} else {
		// The uid is already temp allowlisted, only need to update AMS for temp allowlist
		// duration.
		if (mLocalActivityManager != null) {
		mLocalActivityManager.updateDeviceIdleTempAllowlist(null, uid, true,
		duration, tempAllowListType, reasonCode, reason, callingUid);
		}
		}
		}
		if (informWhitelistChanged) {
		@@ -3941,6 +3948,10 @@ public class DeviceIdleController extends SystemService
		if (idleUntil) {
		mAlarmManager.setIdleUntil(AlarmManager.ELAPSED_REALTIME_WAKEUP,
		mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler);
		} else if (mState == STATE_LOCATING) {
		// Use setExact so we don't keep the GPS active for too long.
		mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,
		mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler);
		} else {
		if (mConstants.USE_WINDOW_ALARMS) {
		mAlarmManager.setWindow(AlarmManager.ELAPSED_REALTIME_WAKEUP,

+1 −1