sm7125-common: sensors: Fix locking around setOperationMode and activate

Change-Id: I9a09f45f012662c8f92fa40da3a4b9dd691a1b2c
3 years ago · 368103569d
parent 6aeec1293a
commit 368103569d
1 changed files with 2 additions and 2 deletions
--- a/sensors/Sensor.cpp
+++ b/sensors/Sensor.cpp
@ -83,8 +83,8 @@ void Sensor::batch(int32_t samplingPeriodNs) {
 }

 void Sensor::activate(bool enable) {
+    std::lock_guard<std::mutex> lock(mRunMutex);
    if (mIsEnabled != enable) {
-        std::unique_lock<std::mutex> lock(mRunMutex);
        mIsEnabled = enable;
        mWaitCV.notify_all();
    }
@ -158,8 +158,8 @@ std::vector<Event> Sensor::readEvents() {
 }

 void Sensor::setOperationMode(OperationMode mode) {
+    std::lock_guard<std::mutex> lock(mRunMutex);
    if (mMode != mode) {
-        std::unique_lock<std::mutex> lock(mRunMutex);
        mMode = mode;
        mWaitCV.notify_all();
    }