Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aa21998 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: fix dump/disconnect race" am: bc5a8364 am: 8b6831cf 

am: 092cedda

Change-Id: I24885f663939fa6aa5dfd550837e350c846798cb
parents 261be854 092cedda

services/camera/libcameraservice/api1/CameraClient.cpp

+6 −1
Original line number Diff line number Diff line
@@ -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;

}



// ----------------------------------------------------------------------------