commit 4a11fede1d7be916bef1ea1765f94c4210998420
author Brian Stack <bstack@google.com> Mon Apr 22 15:07:50 2019 -0700
committer Brian Stack <bstack@google.com> Mon Apr 22 15:24:54 2019 -0700
tree 8f79b9315164256591fd07f3a0ed69c6434eb15b
parent c4f335d6f4b00bac3fde8c439bcc363dff0a77ac

Correctly update sensor status in restricted mode

Mark sensors as active/not active when enabling/disabling Restricted
mode in the Sensor Service. This resolves an issue where sensors were
not able to be correctly activated during CTS testing.

Bug: 131064437
Test: Verified SensorTest#testBatchAndFlush passes
Change-Id: I0109e5c7603d93a41e1597ccc3ecad04bc92c94f

services/sensorservice/SensorDevice.cpp

diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index 6570704..659329e 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -767,6 +767,10 @@
                     checkReturn(mSensors->activate(sensor_handle, 1 /* enabled */)));
             ALOGE_IF(err, "Error activating sensor %d (%s)", sensor_handle, strerror(-err));
         }
+
+        if (err == NO_ERROR) {
+            info.isActive = true;
+        }
     }
 }
 
@@ -774,7 +778,7 @@
     if (mSensors == nullptr) return;
     Mutex::Autolock _l(mLock);
     for (size_t i = 0; i< mActivationCount.size(); ++i) {
-        const Info& info = mActivationCount.valueAt(i);
+        Info& info = mActivationCount.editValueAt(i);
         // Check if this sensor has been activated previously and disable it.
         if (info.batchParams.size() > 0) {
            const int sensor_handle = mActivationCount.keyAt(i);
@@ -788,6 +792,8 @@
                mDisabledClients.add(info.batchParams.keyAt(j));
                ALOGI("added %p to mDisabledClients", info.batchParams.keyAt(j));
            }
+
+           info.isActive = false;
         }
     }
 }