Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amy Zhang
2021-02-23 02:25:28 +00:00
committed by Android (Google) Code Review
parent 879a3ba6db 1ce3a59d78
commit 7658b9e205
5 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/jni/tuner/FilterClient.h
View File

@@ -267,9 +267,6 @@ private:
AidlMQ* mFilterMQ;
EventFlag* mFilterMQEventFlag;
sp<FilterClientCallback> mCallback;
sp<HidlFilterCallback> mHidlCallback;
native_handle_t* mAvSharedHandle;
uint64_t mAvSharedMemSize;
bool mIsMediaFilter;

15
media/jni/tuner/FrontendClient.cpp
View File

@@ -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) {

3
media/jni/tuner/FrontendClient.h
View File

@@ -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;
};

9
media/jni/tuner/LnbClient.cpp
View File

@@ -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;

3
media/jni/tuner/LnbClient.h
View File

@@ -126,9 +126,6 @@ private:
*/
sp<ILnb> mLnb;
shared_ptr<TunerLnbCallback> mAidlCallback;
sp<HidlLnbCallback> mHidlCallback;
LnbId mId;
};
} // namespace android