Merge "Recover AOD state when leaving battery saver" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-03-25 03:00:49 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
} }
} }