commit 29280addfdd6b4573ceb18ccb59c213ba76b4cae
author Peng Xu <pengxu@google.com> Thu Jan 19 01:11:49 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 19 01:11:49 2017 +0000
tree 436572a7b509aa31f6d37eb5684372944ebd6e80
parent 57eb11ed2d6219501cbf8877e17a2575c279c556
parent 4e44cf52e025991bc575140e923c7d2e4ead62b9

Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"

libs/gui/Sensor.cpp

diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp
index 7510429..2c87562 100644
--- a/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@ -219,7 +219,10 @@
         break;
     case SENSOR_TYPE_DYNAMIC_SENSOR_META:
         mStringType = SENSOR_STRING_TYPE_DYNAMIC_SENSOR_META;
-        mFlags = SENSOR_FLAG_SPECIAL_REPORTING_MODE; // special trigger and non-wake up
+        mFlags |= SENSOR_FLAG_SPECIAL_REPORTING_MODE; // special trigger
+        if (halVersion < SENSORS_DEVICE_API_VERSION_1_3) {
+            mFlags |= SENSOR_FLAG_WAKE_UP;
+        }
         break;
     case SENSOR_TYPE_POSE_6DOF:
         mStringType = SENSOR_STRING_TYPE_POSE_6DOF;