summaryrefslogtreecommitdiff
path: root/libs/gui
diff options
context:
space:
mode:
author Peng Xu <pengxu@google.com> 2017-01-19 01:11:49 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-01-19 01:11:49 +0000
commit29280addfdd6b4573ceb18ccb59c213ba76b4cae (patch)
tree436572a7b509aa31f6d37eb5684372944ebd6e80 /libs/gui
parent57eb11ed2d6219501cbf8877e17a2575c279c556 (diff)
parent4e44cf52e025991bc575140e923c7d2e4ead62b9 (diff)
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
Diffstat (limited to 'libs/gui')
-rw-r--r--libs/gui/Sensor.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp
index 7510429645..2c87562bd8 100644
--- a/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@ -219,7 +219,10 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi
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;