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

Commit f7e309d6 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

parents 1ac4db1c 4aa21998

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;

}



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