summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-07-03 12:15:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-07-03 12:15:57 +0000
commitfc73208ec9d6e00e33628056d9774d9729309b2b (patch)
tree421cfa688f55e4c066ad162f39e427460b87cb68
parentfdc84a13a25c205c87b5d5dff92244ae8c295759 (diff)
parente3ac6f853f5ef9a034ef4d8a8c66ac47f3b66188 (diff)
Merge "AOD: Avoid double re-registration of sensors" into oc-dr1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index 610eaffec34b..9981972a96c5 100644
--- 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: