Merge "Camera: fix dump/disconnect race" am: bc5a836479

am: 8b6831cf7b

Change-Id: Ie5e4ae5e81d80ae5b25878ce797964b283e69006

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;
 }
 
 // ----------------------------------------------------------------------------