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

Commit c5151852 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Check for null buffer when calling Transaction#setBuffer" into tm-dev... 

Merge "Check for null buffer when calling Transaction#setBuffer" into tm-dev am: 4c850d74 am: 8002506b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18501090



Change-Id: I0dded4215c49ea487498c32ba4d88eb8d8e319d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2991309d 8002506b

core/jni/android_view_SurfaceControl.cpp

+5 −2
Original line number Diff line number Diff line
@@ -688,8 +688,11 @@ static void nativeSetBuffer(JNIEnv* env, jclass clazz, jlong transactionObj, jlo 
                            jobject bufferObject, jlong fencePtr, jobject releaseCallback) {

    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);

    SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl*>(nativeObject);

    sp<GraphicBuffer> graphicBuffer(GraphicBuffer::fromAHardwareBuffer(

            android_hardware_HardwareBuffer_getNativeHardwareBuffer(env, bufferObject)));

    sp<GraphicBuffer> graphicBuffer;

    if (bufferObject != nullptr) {

        graphicBuffer = GraphicBuffer::fromAHardwareBuffer(

                android_hardware_HardwareBuffer_getNativeHardwareBuffer(env, bufferObject));

    }

    std::optional<sp<Fence>> optFence = std::nullopt;

    if (fencePtr != 0) {

        optFence = sp<Fence>{reinterpret_cast<Fence*>(fencePtr)};