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

Commit e96be102 authored by Scott Randolph's avatar Scott Randolph Committed by android-build-merger
Browse files

Merge "Use explicit .c_str() for hidl_string" into oc-dev 

am: 464d9fbf

Change-Id: Idd68077491a026643722a307ed08f7fb1954357b
parents b90551c1 464d9fbf

media/libmedia/omx/1.0/WOmxNode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ Return<void> TWOmxNode::getExtensionIndex( 
        getExtensionIndex_cb _hidl_cb) {

    OMX_INDEXTYPE index;

    Status status = toStatus(mBase->getExtensionIndex(

            parameterName, &index));

            parameterName.c_str(), &index));

    _hidl_cb(status, toRawIndexType(index));

    return Void();

}

media/libstagefright/omx/1.0/Omx.cpp

+2 −2
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ Return<void> Omx::allocateNode( 
    }



    sp<OMXNodeInstance> instance = new OMXNodeInstance(

            this, new LWOmxObserver(observer), name);

            this, new LWOmxObserver(observer), name.c_str());



    OMX_COMPONENTTYPE *handle;

    OMX_ERRORTYPE err = mMaster->makeComponentInstance(

            name, &OMXNodeInstance::kCallbacks,

            name.c_str(), &OMXNodeInstance::kCallbacks,

            instance.get(), &handle);



    if (err != OMX_ErrorNone) {

media/libstagefright/omx/1.0/WOmxNode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ Return<void> TWOmxNode::getExtensionIndex( 
        getExtensionIndex_cb _hidl_cb) {

    OMX_INDEXTYPE index;

    Status status = toStatus(mBase->getExtensionIndex(

            parameterName, &index));

            parameterName.c_str(), &index));

    _hidl_cb(status, toRawIndexType(index));

    return Void();

}