commit 33685d3a84dea60b4cff3fdbd719542d20b3fdcc
author Peng Xu <pengxu@google.com> Tue Sep 13 18:58:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 13 18:58:18 2016 +0000
tree 3ef600afc5044c920fdfaaac015c3b97d3978dfe
parent 3967e136b22988068353c9171bc60db92cab2179
parent e6a4e9b04ed5cabf028f5094b2f5881739f78882

Merge "Sensor: Make switching from data injection mode to normal mode more productive"
am: e6a4e9b04e

Change-Id: Ic5b3c3bb1856d70a0e12878f8ecdd2cf81868152

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index fb83eff..319f4d4 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -931,9 +931,11 @@
 
 status_t SensorService::resetToNormalModeLocked() {
     SensorDevice& dev(SensorDevice::getInstance());
-    dev.enableAllSensors();
     status_t err = dev.setMode(NORMAL);
-    mCurrentOperatingMode = NORMAL;
+    if (err == NO_ERROR) {
+        mCurrentOperatingMode = NORMAL;
+        dev.enableAllSensors();
+    }
     return err;
 }