commit 980796c31801cadefaf59259fd176b19c5b830d9
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 12 17:44:44 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 12 17:44:44 2017 +0000
tree e2d744d23466c2ae21ca59f4b5ce8d1348092c3a
parent 67106b6dccd1d769dab01dc39131e1bcd2874ed2
parent 12794d4f69e1ef1e17e5c835f2ff9551b9beb3f3

Merge "Camera: fix status tracker race condition"

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index e8b9b20..0c83ed0 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -2326,7 +2326,11 @@
     if (res < 0) return res;
 
     if (mInFlightMap.size() == 1) {
-        mStatusTracker->markComponentActive(mInFlightStatusId);
+        // hold mLock to prevent race with disconnect
+        Mutex::Autolock l(mLock);
+        if (mStatusTracker != nullptr) {
+            mStatusTracker->markComponentActive(mInFlightStatusId);
+        }
     }
 
     return OK;
@@ -2353,7 +2357,11 @@
 
     // Indicate idle inFlightMap to the status tracker
     if (mInFlightMap.size() == 0) {
-        mStatusTracker->markComponentIdle(mInFlightStatusId, Fence::NO_FENCE);
+        // hold mLock to prevent race with disconnect
+        Mutex::Autolock l(mLock);
+        if (mStatusTracker != nullptr) {
+            mStatusTracker->markComponentIdle(mInFlightStatusId, Fence::NO_FENCE);
+        }
     }
 }