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

Commit 0d0d1985 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Camera: Fix potential null pointer dereference issues" into main am: c0ccfdfb am: 1869eb7a am: d6b76cf1

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2745054



Change-Id: I86d2debf91995700544eb139761e70655f07818f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3badbedc d6b76cf1

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(