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

Commit 7658b9e2 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Removed unused local callback in Tuner Client" into sc-dev

parents 879a3ba6 1ce3a59d

media/jni/tuner/FilterClient.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -267,9 +267,6 @@ private: 
    AidlMQ* mFilterMQ;

    AidlMQ* mFilterMQ;

    EventFlag* mFilterMQEventFlag;

    EventFlag* mFilterMQEventFlag;





    sp<FilterClientCallback> mCallback;

    sp<HidlFilterCallback> mHidlCallback;



    native_handle_t* mAvSharedHandle;

    native_handle_t* mAvSharedHandle;

    uint64_t mAvSharedMemSize;

    uint64_t mAvSharedMemSize;

    bool mIsMediaFilter;

    bool mIsMediaFilter;

media/jni/tuner/FrontendClient.cpp

+6 −9
Original line number Original line Diff line number Diff line
@@ -78,8 +78,6 @@ namespace android { 




FrontendClient::FrontendClient(shared_ptr<ITunerFrontend> tunerFrontend, int type) {

FrontendClient::FrontendClient(shared_ptr<ITunerFrontend> tunerFrontend, int type) {

    mTunerFrontend = tunerFrontend;

    mTunerFrontend = tunerFrontend;

    mAidlCallback = NULL;

    mHidlCallback = NULL;

    mType = type;

    mType = type;

}

}
@@ -87,22 +85,21 @@ FrontendClient::~FrontendClient() { 
    mTunerFrontend = NULL;

    mTunerFrontend = NULL;

    mFrontend = NULL;

    mFrontend = NULL;

    mFrontend_1_1 = NULL;

    mFrontend_1_1 = NULL;

    mAidlCallback = NULL;

    mHidlCallback = NULL;

    mId = -1;

    mId = -1;

    mType = -1;

    mType = -1;

}

}





Result FrontendClient::setCallback(sp<FrontendClientCallback> frontendClientCallback) {

Result FrontendClient::setCallback(sp<FrontendClientCallback> frontendClientCallback) {

    if (mTunerFrontend != NULL) {

    if (mTunerFrontend != NULL) {

        mAidlCallback = ::ndk::SharedRefBase::make<TunerFrontendCallback>(frontendClientCallback);

        shared_ptr<TunerFrontendCallback> aidlCallback =

        mAidlCallback->setFrontendType(mType);

                ::ndk::SharedRefBase::make<TunerFrontendCallback>(frontendClientCallback);

        Status s = mTunerFrontend->setCallback(mAidlCallback);

        aidlCallback->setFrontendType(mType);

        Status s = mTunerFrontend->setCallback(aidlCallback);

        return ClientHelper::getServiceSpecificErrorCode(s);

        return ClientHelper::getServiceSpecificErrorCode(s);

    }

    }





    mHidlCallback = new HidlFrontendCallback(frontendClientCallback);

    sp<HidlFrontendCallback> hidlCallback = new HidlFrontendCallback(frontendClientCallback);

    return mFrontend->setCallback(mHidlCallback);

    return mFrontend->setCallback(hidlCallback);

}

}





void FrontendClient::setHidlFrontend(sp<IFrontend> frontend) {

void FrontendClient::setHidlFrontend(sp<IFrontend> frontend) {

media/jni/tuner/FrontendClient.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -226,9 +226,6 @@ private: 
     */

     */

    sp<::android::hardware::tv::tuner::V1_1::IFrontend> mFrontend_1_1;

    sp<::android::hardware::tv::tuner::V1_1::IFrontend> mFrontend_1_1;





    shared_ptr<TunerFrontendCallback> mAidlCallback;

    sp<HidlFrontendCallback> mHidlCallback;



    int mId;

    int mId;

    int mType;

    int mType;

};

};

media/jni/tuner/LnbClient.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -45,14 +45,15 @@ void LnbClient::setHidlLnb(sp<ILnb> lnb) { 




Result LnbClient::setCallback(sp<LnbClientCallback> cb) {

Result LnbClient::setCallback(sp<LnbClientCallback> cb) {

    if (mTunerLnb != NULL) {

    if (mTunerLnb != NULL) {

        mAidlCallback = ::ndk::SharedRefBase::make<TunerLnbCallback>(cb);

        shared_ptr<TunerLnbCallback> aidlCallback =

        Status s = mTunerLnb->setCallback(mAidlCallback);

                ::ndk::SharedRefBase::make<TunerLnbCallback>(cb);

        Status s = mTunerLnb->setCallback(aidlCallback);

        return ClientHelper::getServiceSpecificErrorCode(s);

        return ClientHelper::getServiceSpecificErrorCode(s);

    }

    }





    if (mLnb != NULL) {

    if (mLnb != NULL) {

        mHidlCallback = new HidlLnbCallback(cb);

        sp<HidlLnbCallback> hidlCallback = new HidlLnbCallback(cb);

        return mLnb->setCallback(mHidlCallback);

        return mLnb->setCallback(hidlCallback);

    }

    }





    return Result::INVALID_STATE;

    return Result::INVALID_STATE;

media/jni/tuner/LnbClient.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -126,9 +126,6 @@ private: 
     */

     */

    sp<ILnb> mLnb;

    sp<ILnb> mLnb;





    shared_ptr<TunerLnbCallback> mAidlCallback;

    sp<HidlLnbCallback> mHidlCallback;



    LnbId mId;

    LnbId mId;

};

};

}  // namespace android

}  // namespace android