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

Commit 6763abf2 authored by Abhishek Pant's avatar Abhishek Pant Committed by Linux Build Service Account
Browse files

Framework: Fixing media server crash 

Fixing media server crash when dump() is called
from camera framework after camera HAL instance
has been released.

CRs-fixed: 634328

Conflicts:
        services/camera/libcameraservice/api1/CameraClient.cpp

Change-Id: Ia837f5c0e722db4e6a7187062adc5d8bcfc93dca
parent 02ee4cc7

services/camera/libcameraservice/api1/CameraClient.cpp

+5 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ CameraClient::~CameraClient() { 
status_t CameraClient::dump(int fd, const Vector<String16>& args) {

    const size_t SIZE = 256;

    char buffer[SIZE];



    status_t rc = INVALID_OPERATION;

    size_t len = snprintf(buffer, SIZE, "Client[%d] (%p) PID: %d\n",

            mCameraId,

            getRemoteCallback()->asBinder().get(),
@@ -132,7 +132,10 @@ status_t CameraClient::dump(int fd, const Vector<String16>& args) { 
    const char *enddump = "\n\n";

    write(fd, enddump, strlen(enddump));



    return mHardware->dump(fd, args);

    if (mHardware != NULL) {

        rc =  mHardware->dump(fd, args);

    }

    return rc;

}



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