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

Commit d394cb17 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "codec2: remove assertions when marshalling fences" into tm-dev

parents df612185 a272dd77

media/codec2/vndk/C2Fence.cpp

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



    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;

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

            break;

        default:

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

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

            // return a null-fence in this case

            break;

    }

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