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

Merge "Notify TunerService to updateTunerResources when Tuner Client is init"

Browse Source
This commit is contained in:
Amy Zhang
2021-01-23 02:11:34 +00:00
committed by Android (Google) Code Review
parent 297308fbde 9eeba43cfd
commit b79fd2074a
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,8 +51,12 @@ Result LnbClient::setCallback(sp<LnbClientCallback> cb) {
return TunerClient::getServiceSpecificErrorCode(s);
}
mHidlCallback = new HidlLnbCallback(cb);
return mLnb->setCallback(mHidlCallback);
if (mLnb != NULL) {
mHidlCallback = new HidlLnbCallback(cb);
return mLnb->setCallback(mHidlCallback);
}
return Result::INVALID_STATE;
}
Result LnbClient::setVoltage(LnbVoltage voltage) {

13
media/jni/tuner/TunerClient.cpp
View File

@@ -37,7 +37,9 @@ int TunerClient::mTunerVersion;
TunerClient::TunerClient() {
// Get HIDL Tuner in migration stage.
getHidlTuner();
updateTunerResources();
if (mTuner != NULL) {
updateTunerResources();
}
// Connect with Tuner Service.
::ndk::SpAIBinder binder(AServiceManager_getService("media.tuner"));
mTunerService = ITunerService::fromBinder(binder);
@@ -45,6 +47,9 @@ TunerClient::TunerClient() {
mTunerService = NULL;
if (mTunerService == NULL) {
ALOGE("Failed to get tuner service");
} else {
// TODO: b/178124017 update TRM in TunerService independently.
mTunerService->updateTunerResources();
}
}
@@ -60,10 +65,8 @@ vector<FrontendId> TunerClient::getFrontendIds() {
if (mTunerService != NULL) {
vector<int32_t> v;
int aidl_return;
Status s = mTunerService->getFrontendIds(&v, &aidl_return);
if (!s.isOk() || aidl_return != (int) Result::SUCCESS
|| v.size() == 0) {
Status s = mTunerService->getFrontendIds(&v);
if (getServiceSpecificErrorCode(s) != Result::SUCCESS || v.size() == 0) {
ids.clear();
return ids;
}