commit 01eb71112cfd6514a6b840801d6f490f6fe45b2e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 28 00:27:36 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 28 00:27:41 2017 +0000
tree 9de7cb0ce19ce2263b4eb6a815019877eb84dff7
parent 4e1050f1cfabed4dfa508a2d79bed384ff17d4d2
parent 5f7bee46e1561e293e646565be6851d86a6b7f1e

Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index ae936db..1ece5fc 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -158,13 +158,16 @@
                 break;
             case DOZE:
             case DOZE_AOD:
-            case DOZE_AOD_PAUSED:
                 mDozeSensors.setProxListening(newState != DozeMachine.State.DOZE);
                 mDozeSensors.setListening(true);
                 if (oldState != DozeMachine.State.INITIALIZED) {
                     mDozeSensors.reregisterAllSensors();
                 }
                 break;
+            case DOZE_AOD_PAUSED:
+                mDozeSensors.setProxListening(true);
+                mDozeSensors.setListening(false);
+                break;
             case DOZE_PULSING:
                 mDozeSensors.setProxListening(true);
                 break;