Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev

am: fc73208ec9

Change-Id: Iff1960bfe0d69b2afd3df4fd0f7d7d6a5bffa78e
This commit is contained in:
Adrian Roos
2017-07-03 12:22:53 +00:00
committed by android-build-merger

View File

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