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

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

Merge "Camera: Fix potential null pointer dereference issues" into main

parents a49546d0 3966c1fd

camera/Camera.cpp

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ String8 Camera::getParameters() const 
    ALOGV("getParameters");

    String8 params;

    sp <::android::hardware::ICamera> c = mCamera;

    if (c != 0) params = mCamera->getParameters();

    if (c != 0) params = c->getParameters();

    return params;

}
@@ -269,7 +269,7 @@ void Camera::setPreviewCallbackFlags(int flag) 
    ALOGV("setPreviewCallbackFlags");

    sp <::android::hardware::ICamera> c = mCamera;

    if (c == 0) return;

    mCamera->setPreviewCallbackFlag(flag);

    c->setPreviewCallbackFlag(flag);

}



status_t Camera::setPreviewCallbackTarget(