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

2017-07-03 12:15:57 +00:00
parent fdc84a13a2 e3ac6f853f
commit fc73208ec9
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -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: