Merge "Camera: fix dump/disconnect race"

am: bc5a836479

Change-Id: Iaaa9173d1f65f26d2b611c4cc6f7c25023d90b2a

services/camera/libcameraservice/api1/CameraClient.cpp

@@ -136,7 +136,12 @@ status_t CameraClient::dumpClient(int fd, const Vector<String16>& args) {
     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;
 }
 
 // ----------------------------------------------------------------------------