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

Commit e24a0dce authored by Hongguang's avatar Hongguang
Browse files

Update tuner AIDL HAL. 

*) Remove unused FrontendDtmbCapabilities from ITuner.
*) DemuxFilterTypeDemuxFilterSubType -> DemuxFilterSubType.

Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: I79cb58d3eff559d381a6cf13711250330d2066b1
parent 3dd14c68

tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterTypeDemuxFilterSubType.aidl→tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSubType.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.tv.tuner;

/* @hide */

@VintfStability

union DemuxFilterTypeDemuxFilterSubType {

union DemuxFilterSubType {

  android.hardware.tv.tuner.DemuxTsFilterType tsFilterType = android.hardware.tv.tuner.DemuxTsFilterType.UNDEFINED;

  android.hardware.tv.tuner.DemuxMmtpFilterType mmtpFilterType;

  android.hardware.tv.tuner.DemuxIpFilterType ipFilterType;

tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterType.aidl

+1 −1
Original line number Diff line number Diff line
@@ -36,5 +36,5 @@ package android.hardware.tv.tuner; 
@VintfStability

parcelable DemuxFilterType {

  android.hardware.tv.tuner.DemuxFilterMainType mainType = android.hardware.tv.tuner.DemuxFilterMainType.UNDEFINED;

  android.hardware.tv.tuner.DemuxFilterTypeDemuxFilterSubType subType;

  android.hardware.tv.tuner.DemuxFilterSubType subType;

}

tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterTypeDemuxFilterSubType.aidl→tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSubType.aidl

+2 −1
Original line number Diff line number Diff line
@@ -23,10 +23,11 @@ import android.hardware.tv.tuner.DemuxTlvFilterType; 
import android.hardware.tv.tuner.DemuxTsFilterType;



/**

 * The different Demux Filter Sub Types.

 * @hide

 */

@VintfStability

union DemuxFilterTypeDemuxFilterSubType {

union DemuxFilterSubType {

    DemuxTsFilterType tsFilterType = DemuxTsFilterType.UNDEFINED;



    DemuxMmtpFilterType mmtpFilterType;

tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterType.aidl

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.hardware.tv.tuner;



import android.hardware.tv.tuner.DemuxFilterMainType;

import android.hardware.tv.tuner.DemuxFilterTypeDemuxFilterSubType;

import android.hardware.tv.tuner.DemuxFilterSubType;



/**

 * Demux Filter Type.
@@ -27,5 +27,5 @@ import android.hardware.tv.tuner.DemuxFilterTypeDemuxFilterSubType; 
parcelable DemuxFilterType {

    DemuxFilterMainType mainType = DemuxFilterMainType.UNDEFINED;



    DemuxFilterTypeDemuxFilterSubType subType;

    DemuxFilterSubType subType;

}

tv/tuner/aidl/android/hardware/tv/tuner/ITuner.aidl

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.hardware.tv.tuner.IDemux; 
import android.hardware.tv.tuner.IDescrambler;

import android.hardware.tv.tuner.IFrontend;

import android.hardware.tv.tuner.ILnb;

import android.hardware.tv.tuner.FrontendDtmbCapabilities;



/**

 * Top level interface to manage Frontend, Demux and Decrambler hardware