commit 8cddb920b53462e3fe2aa5c2af6f99d71150ea1b
author Peng Xu <pengxu@google.com> Thu Jan 19 01:17:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 19 01:17:42 2017 +0000
tree e0c9eece392672be5242a6c7151dbbe750856605
parent fe6eb8761d33d33fac7f5278ea2ee7fff01531da
parent cec2ebf676c6ba0f44f9d3c41ca63317f65c179d

Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
am: cec2ebf676

Change-Id: I1f66dba79c07315ca07edf65ff4e7f1135083d6e

core/java/android/hardware/SensorManager.java

diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index 04ee1e6..3ccac69 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -492,7 +492,7 @@
         if (type == Sensor.TYPE_PROXIMITY || type == Sensor.TYPE_SIGNIFICANT_MOTION ||
                 type == Sensor.TYPE_TILT_DETECTOR || type == Sensor.TYPE_WAKE_GESTURE ||
                 type == Sensor.TYPE_GLANCE_GESTURE || type == Sensor.TYPE_PICK_UP_GESTURE ||
-                type == Sensor.TYPE_WRIST_TILT_GESTURE) {
+                type == Sensor.TYPE_WRIST_TILT_GESTURE || type == Sensor.TYPE_DYNAMIC_SENSOR_META) {
             wakeUpSensor = true;
         }