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

Commit 99b8fd47 authored by Hongguang's avatar Hongguang Committed by Hongguang Chen
Browse files

Put TunerFrontendInfo inside of TRM. 

TunerService has moved to AIDL HAL data structures. This
TunerFrontedInfo is only used by TRM after that change.

Bug: 191825295
Test: atest android.media.tv.tuner.cts
Test: atest com.android.server.tv.tunerresourcemanager
Change-Id: I96d9d6881c83231e99acabf69541f8843d7c2dc6
parent e371cf5b

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

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ aidl_interface { 
            enabled: true,

        },

        cpp: {

            enabled: true,

            enabled: false,

        },

        ndk: {

            enabled: true,
@@ -33,5 +33,4 @@ aidl_interface { 
    srcs: [

        ":framework-media-tv-tunerresourcemanager-sources-aidl",

    ],

    imports: ["tv_tuner_frontend_info_aidl_interface"],

}

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

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/**

 * Copyright 2021, 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;



/**

 * FrontendInfo interface that carries tuner frontend information.

 *

 * This is used to update the TunerResourceManager fronted resources.

 * @hide

 */

parcelable TunerFrontendInfo {

    /**

     * Frontend Handle

     */

    int handle;



    /**

     * Frontend Type

     */

    int type;



    /**

     * Frontends are assigned with the same exclusiveGroupId if they can't

     * function at same time. For instance, they share same hardware module.

     */

    int exclusiveGroupId;

}

services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 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;
@@ -31,6 +30,7 @@ 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;