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

Commit 1ce3a59d authored by Amy Zhang's avatar Amy Zhang
Browse files

Removed unused local callback in Tuner Client

Test: make
Bug: 180948146
Change-Id: I1b0a58d1f2ad0a0f40b3f6e6179387a5f757c2ca
parent a7e5dab6
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -267,9 +267,6 @@ private:
    AidlMQ* mFilterMQ;
    EventFlag* mFilterMQEventFlag;

    sp<FilterClientCallback> mCallback;
    sp<HidlFilterCallback> mHidlCallback;

    native_handle_t* mAvSharedHandle;
    uint64_t mAvSharedMemSize;
    bool mIsMediaFilter;
+6 −9
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ namespace android {

FrontendClient::FrontendClient(shared_ptr<ITunerFrontend> tunerFrontend, int type) {
    mTunerFrontend = tunerFrontend;
    mAidlCallback = NULL;
    mHidlCallback = NULL;
    mType = type;
}

@@ -87,22 +85,21 @@ FrontendClient::~FrontendClient() {
    mTunerFrontend = NULL;
    mFrontend = NULL;
    mFrontend_1_1 = NULL;
    mAidlCallback = NULL;
    mHidlCallback = NULL;
    mId = -1;
    mType = -1;
}

Result FrontendClient::setCallback(sp<FrontendClientCallback> frontendClientCallback) {
    if (mTunerFrontend != NULL) {
        mAidlCallback = ::ndk::SharedRefBase::make<TunerFrontendCallback>(frontendClientCallback);
        mAidlCallback->setFrontendType(mType);
        Status s = mTunerFrontend->setCallback(mAidlCallback);
        shared_ptr<TunerFrontendCallback> aidlCallback =
                ::ndk::SharedRefBase::make<TunerFrontendCallback>(frontendClientCallback);
        aidlCallback->setFrontendType(mType);
        Status s = mTunerFrontend->setCallback(aidlCallback);
        return ClientHelper::getServiceSpecificErrorCode(s);
    }

    mHidlCallback = new HidlFrontendCallback(frontendClientCallback);
    return mFrontend->setCallback(mHidlCallback);
    sp<HidlFrontendCallback> hidlCallback = new HidlFrontendCallback(frontendClientCallback);
    return mFrontend->setCallback(hidlCallback);
}

void FrontendClient::setHidlFrontend(sp<IFrontend> frontend) {
+0 −3
Original line number Diff line number Diff line
@@ -226,9 +226,6 @@ private:
     */
    sp<::android::hardware::tv::tuner::V1_1::IFrontend> mFrontend_1_1;

    shared_ptr<TunerFrontendCallback> mAidlCallback;
    sp<HidlFrontendCallback> mHidlCallback;

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

Result LnbClient::setCallback(sp<LnbClientCallback> cb) {
    if (mTunerLnb != NULL) {
        mAidlCallback = ::ndk::SharedRefBase::make<TunerLnbCallback>(cb);
        Status s = mTunerLnb->setCallback(mAidlCallback);
        shared_ptr<TunerLnbCallback> aidlCallback =
                ::ndk::SharedRefBase::make<TunerLnbCallback>(cb);
        Status s = mTunerLnb->setCallback(aidlCallback);
        return ClientHelper::getServiceSpecificErrorCode(s);
    }

    if (mLnb != NULL) {
        mHidlCallback = new HidlLnbCallback(cb);
        return mLnb->setCallback(mHidlCallback);
        sp<HidlLnbCallback> hidlCallback = new HidlLnbCallback(cb);
        return mLnb->setCallback(hidlCallback);
    }

    return Result::INVALID_STATE;
+0 −3
Original line number Diff line number Diff line
@@ -126,9 +126,6 @@ private:
     */
    sp<ILnb> mLnb;

    shared_ptr<TunerLnbCallback> mAidlCallback;
    sp<HidlLnbCallback> mHidlCallback;

    LnbId mId;
};
}  // namespace android