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

Commit 6f3c1bf1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support reassemabling fragmented media events" into main

parents bee65a3b 40aa4a9a

compatibility_matrices/compatibility_matrix.202504.xml

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ 
    </hal>

    <hal format="aidl">

        <name>android.hardware.tv.tuner</name>

        <version>1-2</version>

        <version>1-3</version>

        <interface>

            <name>ITuner</name>

            <instance>default</instance>

tv/tuner/aidl/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ aidl_interface { 
                "android.hardware.common.fmq-V1",

            ],

        },



    ],



}

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

+5 −5
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ package android.hardware.tv.tuner; 
/* @hide */

@Backing(type="int") @VintfStability

enum AudioPreselectionRenderingIndicationType {

  NOT_INDICATED = 0,

  STEREO = 1,

  TWO_DIMENSIONAL = 2,

  THREE_DIMENSIONAL = 3,

  HEADPHONE = 4,

  NOT_INDICATED,

  STEREO,

  TWO_DIMENSIONAL,

  THREE_DIMENSIONAL,

  HEADPHONE,

}

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

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

parcelable AudioPresentation {

  android.hardware.tv.tuner.AudioPreselection preselection;

  int ac4ShortProgramId = -1;

  int ac4ShortProgramId = (-1) /* -1 */;

}

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

+20 −20
Original line number Diff line number Diff line
@@ -35,24 +35,24 @@ package android.hardware.tv.tuner; 
/* @hide */

@Backing(type="int") @VintfStability

enum AudioStreamType {

  UNDEFINED = 0,

  PCM = 1,

  MP3 = 2,

  MPEG1 = 3,

  MPEG2 = 4,

  MPEGH = 5,

  AAC = 6,

  AC3 = 7,

  EAC3 = 8,

  AC4 = 9,

  DTS = 10,

  DTS_HD = 11,

  WMA = 12,

  OPUS = 13,

  VORBIS = 14,

  DRA = 15,

  AAC_ADTS = 16,

  AAC_LATM = 17,

  AAC_HE_ADTS = 18,

  AAC_HE_LATM = 19,

  UNDEFINED,

  PCM,

  MP3,

  MPEG1,

  MPEG2,

  MPEGH,

  AAC,

  AC3,

  EAC3,

  AC4,

  DTS,

  DTS_HD,

  WMA,

  OPUS,

  VORBIS,

  DRA,

  AAC_ADTS,

  AAC_LATM,

  AAC_HE_ADTS,

  AAC_HE_LATM,

}