sensors: use Autolock instead of mutex methods

BUG=none
Change-Id: I2033254032a0d8bdf1bd2342920ca8061c282722
Signed-off-by: Mihai Serban <mihai.serban@intel.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/peripheral/sensors/mraa/SensorsHAL.cpp b/peripheral/sensors/mraa/SensorsHAL.cpp
index eebcd45..4c9238e 100644
--- a/peripheral/sensors/mraa/SensorsHAL.cpp
+++ b/peripheral/sensors/mraa/SensorsHAL.cpp
@@ -193,31 +193,31 @@ int SensorContext::pollEvents(sensors_event_t *data, int count) {
       return nfds;
     }
 
-    mutex.lock();
-    for(i = 0; i < nfds && returnedEvents < count; i++) {
-      if (ev[i].events == EPOLLIN) {
-        sensorIndex = ev[i].data.u32;
-        if ((sensorIndex < 0) || (sensorIndex > sensorsNum)) {
-          ALOGE("%s: Invalid sensor index", __func__);
-          mutex.unlock();
-          return -1;
-        }
-
-        if (sensors[sensorIndex] == nullptr) {
-          /* The sensor might have been deactivated by another thread */
-          continue;
-        }
-
-        /*
-         * The read operation might fail if the data is read by another
-         * pollEvents call executed by another thread.
-         */
-        if (sensors[sensorIndex]->readOneEvent(data + returnedEvents)) {
-          returnedEvents++;
+    { // Autolock scope
+      android::Mutex::Autolock autolock(mutex);
+      for(i = 0; i < nfds && returnedEvents < count; i++) {
+        if (ev[i].events == EPOLLIN) {
+          sensorIndex = ev[i].data.u32;
+          if ((sensorIndex < 0) || (sensorIndex > sensorsNum)) {
+            ALOGE("%s: Invalid sensor index", __func__);
+            return -1;
+          }
+
+          if (sensors[sensorIndex] == nullptr) {
+            /* The sensor might have been deactivated by another thread */
+            continue;
+          }
+
+          /*
+          * The read operation might fail if the data is read by another
+          * pollEvents call executed by another thread.
+          */
+          if (sensors[sensorIndex]->readOneEvent(data + returnedEvents)) {
+            returnedEvents++;
+          }
         }
       }
-    }
-    mutex.unlock();
+    } // Autolock scope
 
     if (returnedEvents > 0) {
       return returnedEvents;