Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev

This commit is contained in:
TreeHugger Robot
2017-06-28 00:27:36 +00:00
committed by Android (Google) Code Review

View File

@@ -158,13 +158,16 @@ public class DozeTriggers implements DozeMachine.Part {
break; break;
case DOZE: case DOZE:
case DOZE_AOD: case DOZE_AOD:
case DOZE_AOD_PAUSED:
mDozeSensors.setProxListening(newState != DozeMachine.State.DOZE); mDozeSensors.setProxListening(newState != DozeMachine.State.DOZE);
mDozeSensors.setListening(true); mDozeSensors.setListening(true);
if (oldState != DozeMachine.State.INITIALIZED) { if (oldState != DozeMachine.State.INITIALIZED) {
mDozeSensors.reregisterAllSensors(); mDozeSensors.reregisterAllSensors();
} }
break; break;
case DOZE_AOD_PAUSED:
mDozeSensors.setProxListening(true);
mDozeSensors.setListening(false);
break;
case DOZE_PULSING: case DOZE_PULSING:
mDozeSensors.setProxListening(true); mDozeSensors.setProxListening(true);
break; break;