commit f7f463120abca9a0050f3e82b0ebd222410e141b
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 26 11:26:01 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 26 11:26:01 2018 +0000
tree 438c6a60c719978277d0677707c5d885dd514269
parent 5ceb8c8cf08db9dbcf0e7f1f94693eee9d11fbba
parent ed2ebe4b3d9b56bba90c0be8258701c40d12d26c

Merge "Camera: Avoid flushing uninitialized devices"

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 1bc5d33..786fd7f 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -2014,6 +2014,13 @@
 
     {
         Mutex::Autolock l(mLock);
+
+        // b/116514106 "disconnect()" can get called twice for the same device. The
+        // camera device will not be initialized during the second run.
+        if (mStatus == STATUS_UNINITIALIZED) {
+            return OK;
+        }
+
         mRequestThread->clear(/*out*/frameNumber);
     }