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

Commit 442dcb01 authored by Hongguang Chen's avatar Hongguang Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix wrong IntDef flag"

parents aea37f3f 2cd6d7f1

media/java/android/media/tv/tuner/DemuxCapabilities.java

+2 −7
Original line number Diff line number Diff line
@@ -36,13 +36,8 @@ import java.lang.annotation.RetentionPolicy; 
public class DemuxCapabilities {



    /** @hide */

    @IntDef(flag = true, value = {

            Filter.TYPE_TS,

            Filter.TYPE_MMTP,

            Filter.TYPE_IP,

            Filter.TYPE_TLV,

            Filter.TYPE_ALP

    })

    @IntDef(value = {Filter.TYPE_TS, Filter.TYPE_MMTP, Filter.TYPE_IP, Filter.TYPE_TLV,

                    Filter.TYPE_ALP})

    @Retention(RetentionPolicy.SOURCE)

    public @interface FilterCapabilities {}

media/java/android/media/tv/tuner/filter/Filter.java

+4 −6
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ public class Filter implements AutoCloseable { 




    /** @hide */

    @IntDef(flag = true, prefix = "STATUS_", value = {STATUS_DATA_READY, STATUS_LOW_WATER,

            STATUS_HIGH_WATER, STATUS_OVERFLOW})

    @IntDef(prefix = "STATUS_",

            value = {STATUS_DATA_READY, STATUS_LOW_WATER, STATUS_HIGH_WATER, STATUS_OVERFLOW})

    @Retention(RetentionPolicy.SOURCE)

    public @interface Status {}
@@ -185,8 +185,7 @@ public class Filter implements AutoCloseable { 
    public static final int STATUS_OVERFLOW = DemuxFilterStatus.OVERFLOW;



    /** @hide */

    @IntDef(flag = true,

            prefix = "SCRAMBLING_STATUS_",

    @IntDef(prefix = "SCRAMBLING_STATUS_",

            value = {SCRAMBLING_STATUS_UNKNOWN, SCRAMBLING_STATUS_NOT_SCRAMBLED,

                    SCRAMBLING_STATUS_SCRAMBLED})

    @Retention(RetentionPolicy.SOURCE)
@@ -209,8 +208,7 @@ public class Filter implements AutoCloseable { 
            android.hardware.tv.tuner.ScramblingStatus.SCRAMBLED;



    /** @hide */

    @IntDef(flag = true,

            prefix = "MONITOR_EVENT_",

    @IntDef(prefix = "MONITOR_EVENT_",

            value = {MONITOR_EVENT_SCRAMBLING_STATUS, MONITOR_EVENT_IP_CID_CHANGE})

    @Retention(RetentionPolicy.SOURCE)

    public @interface MonitorEventMask {}

media/java/android/media/tv/tuner/filter/RecordSettings.java

+3 −7
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ public class RecordSettings extends Settings { 
     *

     * @hide

     */

    @IntDef(flag = true,

            value = {TS_INDEX_INVALID, TS_INDEX_FIRST_PACKET, TS_INDEX_PAYLOAD_UNIT_START_INDICATOR,

    @IntDef(value = {TS_INDEX_INVALID, TS_INDEX_FIRST_PACKET, TS_INDEX_PAYLOAD_UNIT_START_INDICATOR,

                    TS_INDEX_CHANGE_TO_NOT_SCRAMBLED, TS_INDEX_CHANGE_TO_EVEN_SCRAMBLED,

                    TS_INDEX_CHANGE_TO_ODD_SCRAMBLED, TS_INDEX_DISCONTINUITY_INDICATOR,

                    TS_INDEX_RANDOM_ACCESS_INDICATOR, TS_INDEX_PRIORITY_INDICATOR,
@@ -165,7 +164,6 @@ public class RecordSettings extends Settings { 
     * @hide

     */

    @IntDef(prefix = "SC_INDEX_",

            flag = true,

            value = {SC_INDEX_I_FRAME, SC_INDEX_P_FRAME, SC_INDEX_B_FRAME,

                    SC_INDEX_SEQUENCE, SC_INDEX_I_SLICE, SC_INDEX_P_SLICE,

                    SC_INDEX_B_SLICE, SC_INDEX_SI_SLICE, SC_INDEX_SP_SLICE})
@@ -214,8 +212,7 @@ public class RecordSettings extends Settings { 
     *

     * @hide

     */

    @IntDef(flag = true,

            value = {SC_HEVC_INDEX_SPS, SC_HEVC_INDEX_AUD, SC_HEVC_INDEX_SLICE_CE_BLA_W_LP,

    @IntDef(value = {SC_HEVC_INDEX_SPS, SC_HEVC_INDEX_AUD, SC_HEVC_INDEX_SLICE_CE_BLA_W_LP,

            SC_HEVC_INDEX_SLICE_BLA_W_RADL, SC_HEVC_INDEX_SLICE_BLA_N_LP,

            SC_HEVC_INDEX_SLICE_IDR_W_RADL, SC_HEVC_INDEX_SLICE_IDR_N_LP,

            SC_HEVC_INDEX_SLICE_TRAIL_CRA})
@@ -258,8 +255,7 @@ public class RecordSettings extends Settings { 
    /**

     * @hide

     */

    @IntDef(flag = true,

            prefix = "SC_",

    @IntDef(prefix = "SC_",

            value = {

                SC_INDEX_I_FRAME,

                SC_INDEX_P_FRAME,

media/java/android/media/tv/tuner/filter/SharedFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import java.util.concurrent.Executor; 
@SystemApi

public final class SharedFilter implements AutoCloseable {

    /** @hide */

    @IntDef(flag = true, prefix = "STATUS_", value = {STATUS_INACCESSIBLE})

    @IntDef(prefix = "STATUS_", value = {STATUS_INACCESSIBLE})

    @Retention(RetentionPolicy.SOURCE)

    public @interface Status {}

media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java

+2 −4
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ import java.lang.annotation.RetentionPolicy; 
@SystemApi

public class AnalogFrontendSettings extends FrontendSettings {

    /** @hide */

    @IntDef(flag = true,

            prefix = "SIGNAL_TYPE_",

    @IntDef(prefix = "SIGNAL_TYPE_",

            value = {SIGNAL_TYPE_UNDEFINED, SIGNAL_TYPE_AUTO, SIGNAL_TYPE_PAL, SIGNAL_TYPE_PAL_M,

              SIGNAL_TYPE_PAL_N, SIGNAL_TYPE_PAL_60, SIGNAL_TYPE_NTSC, SIGNAL_TYPE_NTSC_443,

              SIGNAL_TYPE_SECAM})
@@ -82,8 +81,7 @@ public class AnalogFrontendSettings extends FrontendSettings { 
    public static final int SIGNAL_TYPE_SECAM = FrontendAnalogType.SECAM;



    /** @hide */

    @IntDef(flag = true,

            prefix = "SIF_",

    @IntDef(prefix = "SIF_",

            value = {SIF_UNDEFINED, SIF_AUTO, SIF_BG, SIF_BG_A2, SIF_BG_NICAM, SIF_I, SIF_DK,

            SIF_DK1_A2, SIF_DK2_A2, SIF_DK3_A2, SIF_DK_NICAM, SIF_L, SIF_M, SIF_M_BTSC, SIF_M_A2,

            SIF_M_EIAJ, SIF_I_NICAM, SIF_L_NICAM, SIF_L_PRIME})