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

Commit bc5a8364 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Camera: fix dump/disconnect race"

parents ec92cd91 9cf785bd
Loading
Loading
Loading
Loading
+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;
}

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