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

am: 2f5f9b6a39

Change-Id: I2f2a33d45c7bd7c6ba3828baefeb051a51cca754
This commit is contained in:
Adrian Roos
2017-07-03 12:28:19 +00:00
committed by android-build-merger

View File

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