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

Commit f96dcd27 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "codec2: remove assertions when marshalling fences" into tm-dev am: d394cb17 am: 4b815198 

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



Change-Id: I83eba30bb91aaa15f4616a6a8909909cd07ebb2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4555e90e 4b815198

media/codec2/vndk/C2Fence.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ public: 
    }

    }





    virtual native_handle_t *createNativeHandle() const {

    virtual native_handle_t *createNativeHandle() const {

        ALOG_ASSERT(false, "Cannot create native handle from surface fence");

        ALOGD("Cannot create native handle from surface fence");

        return nullptr;

        return nullptr;

    }

    }
@@ -287,7 +287,8 @@ C2Fence _C2FenceFactory::CreateFromNativeHandle(const native_handle_t* handle) { 
            p = SyncFenceImpl::CreateFromNativeHandle(handle);

            p = SyncFenceImpl::CreateFromNativeHandle(handle);

            break;

            break;

        default:

        default:

            ALOG_ASSERT(false, "Unsupported fence type %d", type);

            ALOGD("Unsupported fence type %d", type);

            // return a null-fence in this case

            break;

            break;

    }

    }

    if (p && !p->valid()) {

    if (p && !p->valid()) {