commit 0eeed990cb24e1b17eb6f8809b2247444aa571f2
author Stan Rokita <srok@google.com> Tue Aug 06 15:23:49 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 06 15:23:49 2019 +0000
tree b143321bdb0125e6cc60bd654c551ba0ff34f10d
parent b298f43ca07c5521f1646beedcbd48e03b9e8b03
parent 7c9d8958aaa963419a415fff863a6c322e38cfc2

Merge "Skip SensorDevice disable sensors for HAL 2.0"

services/sensorservice/SensorDevice.cpp

diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index 717f317..c7a8f5b 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -134,7 +134,12 @@
 
                     mActivationCount.add(list[i].sensorHandle, model);
 
-                    checkReturn(mSensors->activate(list[i].sensorHandle, 0 /* enabled */));
+                    // Only disable all sensors on HAL 1.0 since HAL 2.0
+                    // handles this in its initialize method
+                    if (!mSensors->supportsMessageQueues()) {
+                        checkReturn(mSensors->activate(list[i].sensorHandle,
+                                    0 /* enabled */));
+                    }
                 }
             }));
 }