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

am: fc73208ec9 Change-Id: Iff1960bfe0d69b2afd3df4fd0f7d7d6a5bffa78e
2017-07-03 12:22:53 +00:00
parent 3ec9d993ce fc73208ec9
commit 2f5f9b6a39
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: