commit b4671196aebe6f4243f877222fdf28a2d6cfa32e
author Adrian Roos <roosa@google.com> Fri Apr 28 01:39:34 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 28 01:39:40 2017 +0000
tree e923ac823ba7de2620b83fbfe9743433e849f0e0
parent b9511da2755c56603fcbdc85a7110dc03c967d32
parent ed85e58656685f0ac28be7678db61edc88cd95e7

Merge "AOD: Wake up on double tap instead of requesting pulse"

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 2096956..a721bf8 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -99,9 +99,20 @@
     }
 
     private void onSensor(int pulseReason, boolean sensorPerformedProxCheck) {
-        requestPulse(pulseReason, sensorPerformedProxCheck);
+        boolean isDoubleTap = pulseReason == DozeLog.PULSE_REASON_SENSOR_DOUBLE_TAP;
+        boolean isPickup = pulseReason == DozeLog.PULSE_REASON_SENSOR_PICKUP;
 
-        if (pulseReason == DozeLog.PULSE_REASON_SENSOR_PICKUP) {
+        if (mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT)) {
+            if (isDoubleTap) {
+                mMachine.wakeUp();
+            } else {
+                mDozeHost.extendPulse();
+            }
+        } else {
+            requestPulse(pulseReason, sensorPerformedProxCheck);
+        }
+
+        if (isPickup) {
             final long timeSinceNotification =
                     SystemClock.elapsedRealtime() - mNotificationPulseTime;
             final boolean withinVibrationThreshold =