diff --git a/media/java/android/media/tv/tuner/DemuxCapabilities.java b/media/java/android/media/tv/tuner/DemuxCapabilities.java index 0f5bf082d44fe..14a9144c9cdc7 100644 --- a/media/java/android/media/tv/tuner/DemuxCapabilities.java +++ b/media/java/android/media/tv/tuner/DemuxCapabilities.java @@ -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 {} diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index 9f44236448779..14accaafe1898 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -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 {} diff --git a/media/java/android/media/tv/tuner/filter/RecordSettings.java b/media/java/android/media/tv/tuner/filter/RecordSettings.java index d34581da29cb8..b16d9fb247b7c 100644 --- a/media/java/android/media/tv/tuner/filter/RecordSettings.java +++ b/media/java/android/media/tv/tuner/filter/RecordSettings.java @@ -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, diff --git a/media/java/android/media/tv/tuner/filter/SharedFilter.java b/media/java/android/media/tv/tuner/filter/SharedFilter.java index 740ab9c45c83e..21964ee5a32a8 100644 --- a/media/java/android/media/tv/tuner/filter/SharedFilter.java +++ b/media/java/android/media/tv/tuner/filter/SharedFilter.java @@ -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 {} diff --git a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java index e0405ef57f2e3..6c1134ae8fac5 100644 --- a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java @@ -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}) diff --git a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java index a7157e20c5e66..c99f911c42369 100644 --- a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java @@ -39,8 +39,7 @@ import java.lang.annotation.RetentionPolicy; public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_AUTO, BANDWIDTH_BANDWIDTH_6MHZ, BANDWIDTH_BANDWIDTH_7MHZ, BANDWIDTH_BANDWIDTH_8MHZ}) @Retention(RetentionPolicy.SOURCE) @@ -69,8 +68,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_QPSK, MODULATION_MOD_16QAM, MODULATION_MOD_64QAM, MODULATION_MOD_256QAM, @@ -113,8 +111,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "TIME_INTERLEAVE_MODE_", + @IntDef(prefix = "TIME_INTERLEAVE_MODE_", value = {TIME_INTERLEAVE_MODE_UNDEFINED, TIME_INTERLEAVE_MODE_AUTO, TIME_INTERLEAVE_MODE_CTI, TIME_INTERLEAVE_MODE_HTI}) @Retention(RetentionPolicy.SOURCE) @@ -140,8 +137,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_2_15, CODERATE_3_15, CODERATE_4_15, CODERATE_5_15, CODERATE_6_15, CODERATE_7_15, CODERATE_8_15, CODERATE_9_15, CODERATE_10_15, CODERATE_11_15, CODERATE_12_15, CODERATE_13_15}) @@ -207,8 +203,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "FEC_", + @IntDef(prefix = "FEC_", value = {FEC_UNDEFINED, FEC_AUTO, FEC_BCH_LDPC_16K, FEC_BCH_LDPC_64K, FEC_CRC_LDPC_16K, FEC_CRC_LDPC_64K, FEC_LDPC_16K, FEC_LDPC_64K}) @Retention(RetentionPolicy.SOURCE) @@ -249,8 +244,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "DEMOD_OUTPUT_FORMAT_", + @IntDef(prefix = "DEMOD_OUTPUT_FORMAT_", value = {DEMOD_OUTPUT_FORMAT_UNDEFINED, DEMOD_OUTPUT_FORMAT_ATSC3_LINKLAYER_PACKET, DEMOD_OUTPUT_FORMAT_BASEBAND_PACKET}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java index 3071ce861e0d8..64c6ce629740a 100644 --- a/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java @@ -34,8 +34,7 @@ import java.lang.annotation.RetentionPolicy; public class AtscFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_8VSB, MODULATION_MOD_16VSB}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java index 6b5d6ca9eb84e..07c1fbffd91e1 100644 --- a/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java @@ -43,8 +43,7 @@ import java.lang.annotation.RetentionPolicy; public final class DtmbFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_AUTO, BANDWIDTH_6MHZ, BANDWIDTH_8MHZ}) @Retention(RetentionPolicy.SOURCE) public @interface Bandwidth {} @@ -68,8 +67,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "TIME_INTERLEAVE_MODE_", + @IntDef(prefix = "TIME_INTERLEAVE_MODE_", value = {TIME_INTERLEAVE_MODE_UNDEFINED, TIME_INTERLEAVE_MODE_AUTO, TIME_INTERLEAVE_MODE_TIMER_INT_240, TIME_INTERLEAVE_MODE_TIMER_INT_720}) @Retention(RetentionPolicy.SOURCE) @@ -97,8 +95,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "GUARD_INTERVAL_", + @IntDef(prefix = "GUARD_INTERVAL_", value = {GUARD_INTERVAL_UNDEFINED, GUARD_INTERVAL_AUTO, GUARD_INTERVAL_PN_420_VARIOUS, GUARD_INTERVAL_PN_595_CONST, GUARD_INTERVAL_PN_945_VARIOUS, GUARD_INTERVAL_PN_420_CONST, @@ -143,8 +140,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_CONSTELLATION_UNDEFINED, MODULATION_CONSTELLATION_AUTO, MODULATION_CONSTELLATION_4QAM, MODULATION_CONSTELLATION_4QAM_NR, MODULATION_CONSTELLATION_16QAM, MODULATION_CONSTELLATION_32QAM, @@ -187,8 +183,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { FrontendDtmbModulation.CONSTELLATION_64QAM; /** @hide */ - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_2_5, CODERATE_3_5, CODERATE_4_5}) @Retention(RetentionPolicy.SOURCE) public @interface CodeRate {} @@ -215,8 +210,7 @@ public final class DtmbFrontendSettings extends FrontendSettings { public static final int CODERATE_4_5 = FrontendDtmbCodeRate.CODERATE_4_5; /** @hide */ - @IntDef(flag = true, - prefix = "TRANSMISSION_MODE_", + @IntDef(prefix = "TRANSMISSION_MODE_", value = {TRANSMISSION_MODE_UNDEFINED, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_C1, TRANSMISSION_MODE_C3780}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java index afe953de53892..45bfc09b8ae70 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java @@ -40,8 +40,7 @@ import java.lang.annotation.RetentionPolicy; public class DvbcFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_16QAM, MODULATION_MOD_32QAM, MODULATION_MOD_64QAM, MODULATION_MOD_128QAM, MODULATION_MOD_256QAM}) @@ -98,8 +97,7 @@ public class DvbcFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "ANNEX_", + @IntDef(prefix = "ANNEX_", value = {ANNEX_UNDEFINED, ANNEX_A, ANNEX_B, ANNEX_C}) @Retention(RetentionPolicy.SOURCE) public @interface Annex {} @@ -159,8 +157,7 @@ public class DvbcFrontendSettings extends FrontendSettings { android.hardware.tv.tuner.FrontendSpectralInversion.INVERTED; /** @hide */ - @IntDef(flag = true, - prefix = "TIME_INTERLEAVE_MODE_", + @IntDef(prefix = "TIME_INTERLEAVE_MODE_", value = {TIME_INTERLEAVE_MODE_UNDEFINED, TIME_INTERLEAVE_MODE_AUTO, TIME_INTERLEAVE_MODE_128_1_0, TIME_INTERLEAVE_MODE_128_1_1, TIME_INTERLEAVE_MODE_64_2, TIME_INTERLEAVE_MODE_32_4, @@ -226,8 +223,7 @@ public class DvbcFrontendSettings extends FrontendSettings { FrontendCableTimeInterleaveMode.INTERLEAVING_128_4; /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_5MHZ, BANDWIDTH_6MHZ, BANDWIDTH_7MHZ, BANDWIDTH_8MHZ}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java index e16f19285100e..56dbb480880b8 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java @@ -42,8 +42,7 @@ import java.lang.annotation.RetentionPolicy; @SystemApi public class DvbsFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "SCAN_TYPE_", + @IntDef(prefix = "SCAN_TYPE_", value = {SCAN_TYPE_UNDEFINED, SCAN_TYPE_DIRECT, SCAN_TYPE_DISEQC, SCAN_TYPE_UNICABLE, SCAN_TYPE_JESS}) @Retention(RetentionPolicy.SOURCE) @@ -75,8 +74,7 @@ public class DvbsFrontendSettings extends FrontendSettings { public static final int SCAN_TYPE_JESS = FrontendDvbsScanType.JESS; /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_QPSK, MODULATION_MOD_8PSK, MODULATION_MOD_16QAM, MODULATION_MOD_16PSK, MODULATION_MOD_32PSK, MODULATION_MOD_ACM, MODULATION_MOD_8APSK, @@ -207,8 +205,7 @@ public class DvbsFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "STANDARD_", + @IntDef(prefix = "STANDARD_", value = {STANDARD_AUTO, STANDARD_S, STANDARD_S2, STANDARD_S2X}) @Retention(RetentionPolicy.SOURCE) public @interface Standard {} diff --git a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java index d86e9a8af5f65..06547e1fc0e7b 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java @@ -42,8 +42,7 @@ import java.lang.annotation.RetentionPolicy; public class DvbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "TRANSMISSION_MODE_", + @IntDef(prefix = "TRANSMISSION_MODE_", value = {TRANSMISSION_MODE_UNDEFINED, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_4K, TRANSMISSION_MODE_1K, TRANSMISSION_MODE_16K, TRANSMISSION_MODE_32K}) @@ -98,8 +97,7 @@ public class DvbtFrontendSettings extends FrontendSettings { FrontendDvbtTransmissionMode.MODE_32K_E; /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_AUTO, BANDWIDTH_8MHZ, BANDWIDTH_7MHZ, BANDWIDTH_6MHZ, BANDWIDTH_5MHZ, BANDWIDTH_1_7MHZ, BANDWIDTH_10MHZ}) @Retention(RetentionPolicy.SOURCE) @@ -140,8 +138,7 @@ public class DvbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "CONSTELLATION_", + @IntDef(prefix = "CONSTELLATION_", value = {CONSTELLATION_UNDEFINED, CONSTELLATION_AUTO, CONSTELLATION_QPSK, CONSTELLATION_16QAM, CONSTELLATION_64QAM, CONSTELLATION_256QAM, CONSTELLATION_QPSK_R, CONSTELLATION_16QAM_R, CONSTELLATION_64QAM_R, @@ -192,8 +189,7 @@ public class DvbtFrontendSettings extends FrontendSettings { FrontendDvbtConstellation.CONSTELLATION_256QAM_R; /** @hide */ - @IntDef(flag = true, - prefix = "HIERARCHY_", + @IntDef(prefix = "HIERARCHY_", value = {HIERARCHY_UNDEFINED, HIERARCHY_AUTO, HIERARCHY_NON_NATIVE, HIERARCHY_1_NATIVE, HIERARCHY_2_NATIVE, HIERARCHY_4_NATIVE, HIERARCHY_NON_INDEPTH, HIERARCHY_1_INDEPTH, HIERARCHY_2_INDEPTH, HIERARCHY_4_INDEPTH}) @@ -243,8 +239,7 @@ public class DvbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_1_2, CODERATE_2_3, CODERATE_3_4, CODERATE_5_6, CODERATE_7_8, CODERATE_3_5, CODERATE_4_5, CODERATE_6_7, CODERATE_8_9}) @Retention(RetentionPolicy.SOURCE) @@ -296,8 +291,7 @@ public class DvbtFrontendSettings extends FrontendSettings { public static final int CODERATE_8_9 = FrontendDvbtCoderate.CODERATE_8_9; /** @hide */ - @IntDef(flag = true, - prefix = "GUARD_INTERVAL_", + @IntDef(prefix = "GUARD_INTERVAL_", value = {GUARD_INTERVAL_UNDEFINED, GUARD_INTERVAL_AUTO, GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4, @@ -346,8 +340,7 @@ public class DvbtFrontendSettings extends FrontendSettings { public static final int GUARD_INTERVAL_19_256 = FrontendDvbtGuardInterval.INTERVAL_19_256; /** @hide */ - @IntDef(flag = true, - prefix = "STANDARD", + @IntDef(prefix = "STANDARD_", value = {STANDARD_AUTO, STANDARD_T, STANDARD_T2} ) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/FrontendSettings.java index 38bffec3f77fe..2f45a70720175 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendSettings.java @@ -89,8 +89,7 @@ public abstract class FrontendSettings { /** @hide */ - @LongDef(flag = true, - prefix = "FEC_", + @LongDef(prefix = "FEC_", value = {FEC_UNDEFINED, FEC_AUTO, FEC_1_2, FEC_1_3, FEC_1_4, FEC_1_5, FEC_2_3, FEC_2_5, FEC_2_9, FEC_3_4, FEC_3_5, FEC_4_5, FEC_4_15, FEC_5_6, FEC_5_9, FEC_6_7, FEC_7_8, FEC_7_9, FEC_7_15, FEC_8_9, FEC_8_15, FEC_9_10, FEC_9_20, FEC_11_15, FEC_11_20, diff --git a/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java index 726fe15b8edb5..7e83d15450326 100644 --- a/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java @@ -36,8 +36,7 @@ import java.lang.annotation.RetentionPolicy; @SystemApi public class Isdbs3FrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_BPSK, MODULATION_MOD_QPSK, MODULATION_MOD_8PSK, MODULATION_MOD_16APSK, MODULATION_MOD_32APSK}) @@ -75,8 +74,7 @@ public class Isdbs3FrontendSettings extends FrontendSettings { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_1_3, CODERATE_2_5, CODERATE_1_2, CODERATE_3_5, CODERATE_2_3, CODERATE_3_4, CODERATE_7_9, CODERATE_4_5, CODERATE_5_6, CODERATE_7_8, CODERATE_9_10}) diff --git a/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java index 51ec5aeeb2eb0..50294539e8f8d 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java @@ -54,8 +54,7 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_BPSK, MODULATION_MOD_QPSK, MODULATION_MOD_TC8PSK}) @Retention(RetentionPolicy.SOURCE) @@ -84,8 +83,7 @@ public class IsdbsFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "CODERATE_", + @IntDef(prefix = "CODERATE_", value = {CODERATE_UNDEFINED, CODERATE_AUTO, CODERATE_1_2, CODERATE_2_3, CODERATE_3_4, CODERATE_5_6, CODERATE_7_8}) @Retention(RetentionPolicy.SOURCE) diff --git a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java index 89512a05674ba..f08a51497f758 100644 --- a/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java @@ -40,8 +40,7 @@ import java.lang.annotation.RetentionPolicy; @SystemApi public class IsdbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODULATION_", + @IntDef(prefix = "MODULATION_", value = {MODULATION_UNDEFINED, MODULATION_AUTO, MODULATION_MOD_DQPSK, MODULATION_MOD_QPSK, MODULATION_MOD_16QAM, MODULATION_MOD_64QAM}) @Retention(RetentionPolicy.SOURCE) @@ -74,8 +73,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "MODE_", + @IntDef(prefix = "MODE_", value = {MODE_UNDEFINED, MODE_AUTO, MODE_1, MODE_2, MODE_3}) @Retention(RetentionPolicy.SOURCE) public @interface Mode {} @@ -103,8 +101,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { /** @hide */ - @IntDef(flag = true, - prefix = "BANDWIDTH_", + @IntDef(prefix = "BANDWIDTH_", value = {BANDWIDTH_UNDEFINED, BANDWIDTH_AUTO, BANDWIDTH_8MHZ, BANDWIDTH_7MHZ, BANDWIDTH_6MHZ}) @Retention(RetentionPolicy.SOURCE) @@ -132,7 +129,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { public static final int BANDWIDTH_6MHZ = FrontendIsdbtBandwidth.BANDWIDTH_6MHZ; /** @hide */ - @IntDef(flag = true, prefix = "PARTIAL_RECEPTION_FLAG_", + @IntDef(prefix = "PARTIAL_RECEPTION_FLAG_", value = {PARTIAL_RECEPTION_FLAG_UNDEFINED, PARTIAL_RECEPTION_FLAG_FALSE, PARTIAL_RECEPTION_FLAG_TRUE}) @Retention(RetentionPolicy.SOURCE) @@ -153,7 +150,7 @@ public class IsdbtFrontendSettings extends FrontendSettings { public static final int PARTIAL_RECEPTION_FLAG_TRUE = FrontendIsdbtPartialReceptionFlag.TRUE; /** @hide */ - @IntDef(flag = true, prefix = "TIME_INTERLEAVE_MODE_", + @IntDef(prefix = "TIME_INTERLEAVE_MODE_", value = {TIME_INTERLEAVE_MODE_UNDEFINED, TIME_INTERLEAVE_MODE_AUTO, TIME_INTERLEAVE_MODE_1_0, TIME_INTERLEAVE_MODE_1_4, TIME_INTERLEAVE_MODE_1_8, TIME_INTERLEAVE_MODE_1_16, TIME_INTERLEAVE_MODE_2_0, TIME_INTERLEAVE_MODE_2_2,