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

Commit b728aeb3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "tuner_aidl_isdbt_update" 

* changes:
  Update tuner AIDL default implementation.
  Fix a typo in ISDBT Frontend.
parents e45f4fb5 e69a3b29

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

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

union FrontendGuardInterval {

  android.hardware.tv.tuner.FrontendDvbtGuardInterval dvbt = android.hardware.tv.tuner.FrontendDvbtGuardInterval.UNDEFINED;

  android.hardware.tv.tuner.FrontendDvbtGuardInterval isdbt;

  android.hardware.tv.tuner.FrontendIsdbtGuardInterval isdbt;

  android.hardware.tv.tuner.FrontendDtmbGuardInterval dtmb;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ parcelable FrontendIsdbtSettings { 
  android.hardware.tv.tuner.FrontendIsdbtModulation modulation = android.hardware.tv.tuner.FrontendIsdbtModulation.UNDEFINED;

  android.hardware.tv.tuner.FrontendIsdbtBandwidth bandwidth = android.hardware.tv.tuner.FrontendIsdbtBandwidth.UNDEFINED;

  android.hardware.tv.tuner.FrontendIsdbtMode mode = android.hardware.tv.tuner.FrontendIsdbtMode.UNDEFINED;

  android.hardware.tv.tuner.FrontendDvbtCoderate coderate = android.hardware.tv.tuner.FrontendDvbtCoderate.UNDEFINED;

  android.hardware.tv.tuner.FrontendDvbtGuardInterval guardInterval = android.hardware.tv.tuner.FrontendDvbtGuardInterval.UNDEFINED;

  android.hardware.tv.tuner.FrontendIsdbtCoderate coderate = android.hardware.tv.tuner.FrontendIsdbtCoderate.UNDEFINED;

  android.hardware.tv.tuner.FrontendIsdbtGuardInterval guardInterval = android.hardware.tv.tuner.FrontendIsdbtGuardInterval.UNDEFINED;

  int serviceAreaId;

}

tv/tuner/aidl/android/hardware/tv/tuner/FrontendGuardInterval.aidl

+3 −1
Original line number Diff line number Diff line
@@ -18,15 +18,17 @@ package android.hardware.tv.tuner; 


import android.hardware.tv.tuner.FrontendDvbtGuardInterval;

import android.hardware.tv.tuner.FrontendDtmbGuardInterval;

import android.hardware.tv.tuner.FrontendIsdbtGuardInterval;



/**

 * The different Guard Interval Types.

 * @hide

 */

@VintfStability

union FrontendGuardInterval {

    FrontendDvbtGuardInterval dvbt = FrontendDvbtGuardInterval.UNDEFINED;



    FrontendDvbtGuardInterval isdbt;

    FrontendIsdbtGuardInterval isdbt;



    FrontendDtmbGuardInterval dtmb;

}

tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbtCapabilities.aidl

+2 −2
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ parcelable FrontendIsdbtCapabilities { 
    int modulationCap;



    /**

     * Code Rates defined by FrontendDvbtCoderate.

     * Code Rates defined by FrontendIsdbtCoderate.

     */

    int coderateCap;



    /**

     * Guard Interval Types defined by FrontendDvbtGuardInterval.

     * Guard Interval Types defined by FrontendIsdbtGuardInterval.

     */

    int guardIntervalCap;

}

tv/tuner/aidl/android/hardware/tv/tuner/FrontendIsdbtCoderate.aidl

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



/**

 * Hierarchy Type for ISDBT.

 * Code Rate for ISDBT.

 * @hide

 */

@VintfStability