Merge "Replace TRM TunerFronendInfo with the TunerSerivce aidl TunerFrontendInfo" (452cc8ed) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/tunerresourcemanager/Android.bp

+3 −11

Original line number	Diff line number	Diff line
		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"],
		}

media/java/android/media/tv/tunerresourcemanager/TunerResourceManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

media/java/android/media/tv/tunerresourcemanager/aidl/android/media/tv/tunerresourcemanager/ITunerResourceManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

media/java/android/media/tv/tunerresourcemanager/aidl/android/media/tv/tunerresourcemanager/TunerFrontendInfo.aidl

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		/*
		* 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;
		}

media/jni/tuner/TunerClient.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -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),