commit bc5a836479a6f93cc9ef29a2cc4e8dbe1d9c7de1
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 04 19:43:19 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 04 19:43:19 2017 +0000
tree db9950f37381a4d3169ef02af8a1fcb56effb6dc
parent ec92cd91f79ab44aaf352e09713b82b71f25207e
parent 9cf785bdd9ec8ff83c7d6226b7435e96e0018d33

Merge "Camera: fix dump/disconnect race"

services/camera/libcameraservice/api1/CameraClient.cpp

diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp
index a407d0b..910dd78 100644
--- a/services/camera/libcameraservice/api1/CameraClient.cpp
+++ b/services/camera/libcameraservice/api1/CameraClient.cpp
@@ -136,7 +136,12 @@
     const char *enddump = "\n\n";
     write(fd, enddump, strlen(enddump));
 
-    return mHardware->dump(fd, args);
+    sp<CameraHardwareInterface> hardware = mHardware;
+    if (hardware != nullptr) {
+        return hardware->dump(fd, args);
+    }
+    ALOGI("%s: camera device closed already, skip dumping", __FUNCTION__);
+    return OK;
 }
 
 // ----------------------------------------------------------------------------