Merge "Recover AOD state when leaving battery saver" into rvc-dev am: f3736be0b3 (e9e64d42) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -490,6 +490,9 @@ public class DozeTriggers implements DozeMachine.Part {
	public void onPowerSaveChanged(boolean active) {		public void onPowerSaveChanged(boolean active) {
	if (mDozeHost.isPowerSaveActive()) {		if (mDozeHost.isPowerSaveActive()) {
	mMachine.requestState(DozeMachine.State.DOZE);		mMachine.requestState(DozeMachine.State.DOZE);
			} else if (mMachine.getState() == DozeMachine.State.DOZE
			&& mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT)) {
			mMachine.requestState(DozeMachine.State.DOZE_AOD);
	}		}
	}		}