commit 85171c016e61e5c19abb836ca9ec669153387162
author Peng Xu <pengxu@google.com> Tue Sep 13 19:56:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 13 19:56:10 2016 +0000
tree 4b3524439c0bc5eb24beb3f2e0b6d7e7985977cd
parent fe25ad772debee496fe7c28aeb7fa7ab7b52f91a
parent 0674efdbfa0f462fe37f628257c1373d7d95ba06

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

Change-Id: I056c8fbdf6d4392fc34b9e5b318d2e79afe499d9

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index dbd0624..4770608 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -945,9 +945,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;
 }