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

Replace TRM TunerFronendInfo with the TunerSerivce aidl

Browse Source 
TunerFrontendInfo

Test: make
Bug: 172079283
Change-Id: Idb915a9932750924a5ea969ee4ab3695efeaca24
This commit is contained in:
Amy Zhang
2021-01-13 16:30:24 -08:00
parent b9f3cab02a
commit d1fd5ac468
8 changed files with 17 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/java/android/media/tv/tunerresourcemanager/Android.bp
View File

@@ -1,16 +1,7 @@
filegroup {
name: "framework-media-tv-tunerresourcemanager-sources-aidl",
srcs: [
"aidl/android/media/tv/tunerresourcemanager/CasSessionRequest.aidl",
"aidl/android/media/tv/tunerresourcemanager/IResourcesReclaimListener.aidl",
"aidl/android/media/tv/tunerresourcemanager/ResourceClientProfile.aidl",
"aidl/android/media/tv/tunerresourcemanager/TunerCiCamRequest.aidl",
"aidl/android/media/tv/tunerresourcemanager/TunerDemuxRequest.aidl",
"aidl/android/media/tv/tunerresourcemanager/TunerDescramblerRequest.aidl",
"aidl/android/media/tv/tunerresourcemanager/TunerFrontendInfo.aidl",
"aidl/android/media/tv/tunerresourcemanager/TunerFrontendRequest.aidl",
"aidl/android/media/tv/tunerresourcemanager/TunerLnbRequest.aidl",
"aidl/android/media/tv/tunerresourcemanager/ITunerResourceManager.aidl",
"aidl/android/media/tv/tunerresourcemanager/*.aidl",
],
path: "aidl",
}
@@ -21,7 +12,7 @@ aidl_interface {
local_include_dir: "aidl",
backend: {
java: {
sdk_version: "current",
enabled: true,
},
cpp: {
enabled: true,
@@ -33,4 +24,5 @@ aidl_interface {
srcs: [
":framework-media-tv-tunerresourcemanager-sources-aidl",
],
imports: ["tv_tuner_frontend_info_aidl_interface"],
}

1
media/java/android/media/tv/tunerresourcemanager/TunerResourceManager.java
View File

@@ -24,6 +24,7 @@ import android.annotation.RequiresFeature;
import android.annotation.SystemService;
import android.content.Context;
import android.content.pm.PackageManager;
import android.media.tv.tuner.TunerFrontendInfo;
import android.os.Binder;
import android.os.RemoteException;
import android.util.Log;

2
media/java/android/media/tv/tunerresourcemanager/aidl/android/media/tv/tunerresourcemanager/ITunerResourceManager.aidl
View File

@@ -16,13 +16,13 @@
package android.media.tv.tunerresourcemanager;
import android.media.tv.tuner.TunerFrontendInfo;
import android.media.tv.tunerresourcemanager.CasSessionRequest;
import android.media.tv.tunerresourcemanager.IResourcesReclaimListener;
import android.media.tv.tunerresourcemanager.ResourceClientProfile;
import android.media.tv.tunerresourcemanager.TunerCiCamRequest;
import android.media.tv.tunerresourcemanager.TunerDemuxRequest;
import android.media.tv.tunerresourcemanager.TunerDescramblerRequest;
import android.media.tv.tunerresourcemanager.TunerFrontendInfo;
import android.media.tv.tunerresourcemanager.TunerFrontendRequest;
import android.media.tv.tunerresourcemanager.TunerLnbRequest;

30
media/java/android/media/tv/tunerresourcemanager/aidl/android/media/tv/tunerresourcemanager/TunerFrontendInfo.aidl
View File

@@ -1,30 +0,0 @@
/*
* Copyright 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.media.tv.tunerresourcemanager;
/**
* Simple container of the FrontendInfo struct defined in the TunerHAL 1.0 interface.
*
* @hide
*/
parcelable TunerFrontendInfo {
int handle;
int frontendType;
int exclusiveGroupId;
}

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

@@ -25,8 +25,6 @@
using ::android::hardware::tv::tuner::V1_0::FrontendId;
using ::android::hardware::tv::tuner::V1_0::FrontendType;
using ::aidl::android::media::tv::tunerresourcemanager::TunerFrontendInfo;
namespace android {
sp<ITuner> TunerClient::mTuner;
@@ -104,7 +102,7 @@ sp<FrontendClient> TunerClient::openFrontend(int frontendHandle) {
int id;
// TODO: handle error code
tunerFrontend->getFrontendId(&id);
TunerServiceFrontendInfo aidlFrontendInfo;
TunerFrontendInfo aidlFrontendInfo;
// TODO: handle error code
mTunerService->getFrontendInfo(id, &aidlFrontendInfo);
return new FrontendClient(tunerFrontend, frontendHandle, aidlFrontendInfo.type);
@@ -130,7 +128,7 @@ sp<FrontendClient> TunerClient::openFrontend(int frontendHandle) {
shared_ptr<FrontendInfo> TunerClient::getFrontendInfo(int id) {
if (mTunerService != NULL) {
TunerServiceFrontendInfo aidlFrontendInfo;
TunerFrontendInfo aidlFrontendInfo;
// TODO: handle error code
mTunerService->getFrontendInfo(id, &aidlFrontendInfo);
return make_shared<FrontendInfo>(FrontendInfoAidlToHidl(aidlFrontendInfo));
@@ -303,7 +301,7 @@ void TunerClient::updateFrontendResources() {
}
TunerFrontendInfo tunerFrontendInfo{
.handle = getResourceHandleFromId((int)ids[i], FRONTEND),
.frontendType = static_cast<int>(frontendInfo->type),
.type = static_cast<int>(frontendInfo->type),
.exclusiveGroupId = static_cast<int>(frontendInfo->exclusiveGroupId),
};
infos.push_back(tunerFrontendInfo);
@@ -452,7 +450,7 @@ vector<int> TunerClient::getLnbHandles() {
return lnbHandles;
}
FrontendInfo TunerClient::FrontendInfoAidlToHidl(TunerServiceFrontendInfo aidlFrontendInfo) {
FrontendInfo TunerClient::FrontendInfoAidlToHidl(TunerFrontendInfo aidlFrontendInfo) {
FrontendInfo hidlFrontendInfo {
.type = static_cast<FrontendType>(aidlFrontendInfo.type),
.minFrequency = static_cast<uint32_t>(aidlFrontendInfo.minFrequency),

6
media/jni/tuner/TunerClient.h
View File

@@ -18,8 +18,8 @@
#define _ANDROID_MEDIA_TV_TUNER_CLIENT_H_
#include <aidl/android/media/tv/tunerresourcemanager/ITunerResourceManager.h>
#include <aidl/android/media/tv/tunerresourcemanager/TunerFrontendInfo.h>
#include <aidl/android/media/tv/tuner/ITunerService.h>
#include <aidl/android/media/tv/tuner/TunerFrontendInfo.h>
#include <android/hardware/tv/tuner/1.1/ITuner.h>
#include <android/hardware/tv/tuner/1.1/types.h>
@@ -29,7 +29,7 @@
#include "LnbClient.h"
using ::aidl::android::media::tv::tuner::ITunerService;
using ::aidl::android::media::tv::tuner::TunerServiceFrontendInfo;
using ::aidl::android::media::tv::tuner::TunerFrontendInfo;
using ::aidl::android::media::tv::tunerresourcemanager::ITunerResourceManager;
using ::android::hardware::tv::tuner::V1_0::DemuxCapabilities;
@@ -141,7 +141,7 @@ private:
sp<ILnb> openHidlLnbByName(string name, LnbId& lnbId);
sp<IDescrambler> openHidlDescrambler();
vector<int> getLnbHandles();
FrontendInfo FrontendInfoAidlToHidl(TunerServiceFrontendInfo aidlFrontendInfo);
FrontendInfo FrontendInfoAidlToHidl(TunerFrontendInfo aidlFrontendInfo);
void updateTunerResources();
void updateFrontendResources();
void updateLnbResources();

4
services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java
View File

@@ -23,6 +23,7 @@ import android.app.ActivityManager.RunningAppProcessInfo;
import android.content.Context;
import android.media.IResourceManagerService;
import android.media.tv.TvInputManager;
import android.media.tv.tuner.TunerFrontendInfo;
import android.media.tv.tunerresourcemanager.CasSessionRequest;
import android.media.tv.tunerresourcemanager.IResourcesReclaimListener;
import android.media.tv.tunerresourcemanager.ITunerResourceManager;
@@ -30,7 +31,6 @@ import android.media.tv.tunerresourcemanager.ResourceClientProfile;
import android.media.tv.tunerresourcemanager.TunerCiCamRequest;
import android.media.tv.tunerresourcemanager.TunerDemuxRequest;
import android.media.tv.tunerresourcemanager.TunerDescramblerRequest;
import android.media.tv.tunerresourcemanager.TunerFrontendInfo;
import android.media.tv.tunerresourcemanager.TunerFrontendRequest;
import android.media.tv.tunerresourcemanager.TunerLnbRequest;
import android.media.tv.tunerresourcemanager.TunerResourceManager;
@@ -578,7 +578,7 @@ public class TunerResourceManagerService extends SystemService implements IBinde
} else {
// Add a new fe resource
FrontendResource newFe = new FrontendResource.Builder(infos[i].handle)
.type(infos[i].frontendType)
.type(infos[i].type)
.exclusiveGroupId(infos[i].exclusiveGroupId)
.build();
addFrontendResource(newFe);

6
services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/TunerResourceManagerServiceTest.java
View File

@@ -25,6 +25,7 @@ import android.content.ContextWrapper;
import android.media.tv.ITvInputManager;
import android.media.tv.TvInputManager;
import android.media.tv.TvInputService;
import android.media.tv.tuner.TunerFrontendInfo;
import android.media.tv.tuner.frontend.FrontendSettings;
import android.media.tv.tunerresourcemanager.CasSessionRequest;
import android.media.tv.tunerresourcemanager.IResourcesReclaimListener;
@@ -32,7 +33,6 @@ import android.media.tv.tunerresourcemanager.ResourceClientProfile;
import android.media.tv.tunerresourcemanager.TunerCiCamRequest;
import android.media.tv.tunerresourcemanager.TunerDemuxRequest;
import android.media.tv.tunerresourcemanager.TunerDescramblerRequest;
import android.media.tv.tunerresourcemanager.TunerFrontendInfo;
import android.media.tv.tunerresourcemanager.TunerFrontendRequest;
import android.media.tv.tunerresourcemanager.TunerLnbRequest;
import android.media.tv.tunerresourcemanager.TunerResourceManager;
@@ -88,7 +88,7 @@ public class TunerResourceManagerServiceTest {
}
return actual.getHandle() == expected.handle
&& actual.getType() == expected.frontendType
&& actual.getType() == expected.type
&& actual.getExclusiveGroupId() == expected.exclusiveGroupId;
}, "is correctly configured from ");
@@ -1156,7 +1156,7 @@ public class TunerResourceManagerServiceTest {
int handle, int frontendType, int exclusiveGroupId) {
TunerFrontendInfo info = new TunerFrontendInfo();
info.handle = handle;
info.frontendType = frontendType;
info.type = frontendType;
info.exclusiveGroupId = exclusiveGroupId;
return info;
}