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

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

Merge "Remove duplicate term in the definition" into rvc-dev

parents 9432967d 25b1c3a4

api/system-current.txt

+15 −15
Original line number Diff line number Diff line
@@ -5620,8 +5620,8 @@ package android.media.tv.tuner.frontend { 
    method public int getConstellation();

    method public int getGuardInterval();

    method public int getHierarchy();

    method public int getHpCodeRate();

    method public int getLpCodeRate();

    method public int getHighPriorityCodeRate();

    method public int getLowPriorityCodeRate();

    method public int getPlpGroupId();

    method public int getPlpId();

    method public int getPlpMode();
@@ -5649,20 +5649,20 @@ package android.media.tv.tuner.frontend { 
    field public static final int CODERATE_8_9 = 512; // 0x200

    field public static final int CODERATE_AUTO = 1; // 0x1

    field public static final int CODERATE_UNDEFINED = 0; // 0x0

    field public static final int CONSTELLATION_16QAM = 4; // 0x4

    field public static final int CONSTELLATION_256QAM = 16; // 0x10

    field public static final int CONSTELLATION_64QAM = 8; // 0x8

    field public static final int CONSTELLATION_AUTO = 1; // 0x1

    field public static final int CONSTELLATION_CONSTELLATION_16QAM = 4; // 0x4

    field public static final int CONSTELLATION_CONSTELLATION_256QAM = 16; // 0x10

    field public static final int CONSTELLATION_CONSTELLATION_64QAM = 8; // 0x8

    field public static final int CONSTELLATION_CONSTELLATION_QPSK = 2; // 0x2

    field public static final int CONSTELLATION_QPSK = 2; // 0x2

    field public static final int CONSTELLATION_UNDEFINED = 0; // 0x0

    field public static final int GUARD_INTERVAL_19_128 = 64; // 0x40

    field public static final int GUARD_INTERVAL_19_256 = 128; // 0x80

    field public static final int GUARD_INTERVAL_1_128 = 32; // 0x20

    field public static final int GUARD_INTERVAL_1_16 = 4; // 0x4

    field public static final int GUARD_INTERVAL_1_32 = 2; // 0x2

    field public static final int GUARD_INTERVAL_1_4 = 16; // 0x10

    field public static final int GUARD_INTERVAL_1_8 = 8; // 0x8

    field public static final int GUARD_INTERVAL_AUTO = 1; // 0x1

    field public static final int GUARD_INTERVAL_INTERVAL_19_128 = 64; // 0x40

    field public static final int GUARD_INTERVAL_INTERVAL_19_256 = 128; // 0x80

    field public static final int GUARD_INTERVAL_INTERVAL_1_128 = 32; // 0x20

    field public static final int GUARD_INTERVAL_INTERVAL_1_16 = 4; // 0x4

    field public static final int GUARD_INTERVAL_INTERVAL_1_32 = 2; // 0x2

    field public static final int GUARD_INTERVAL_INTERVAL_1_4 = 16; // 0x10

    field public static final int GUARD_INTERVAL_INTERVAL_1_8 = 8; // 0x8

    field public static final int GUARD_INTERVAL_UNDEFINED = 0; // 0x0

    field public static final int HIERARCHY_1_INDEPTH = 64; // 0x40

    field public static final int HIERARCHY_1_NATIVE = 4; // 0x4
@@ -5697,8 +5697,8 @@ package android.media.tv.tuner.frontend { 
    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setGuardInterval(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setHierarchy(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setHighPriority(boolean);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setHpCodeRate(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setLpCodeRate(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setHighPriorityCodeRate(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setLowPriorityCodeRate(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setMiso(boolean);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setPlpGroupId(int);

    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setPlpId(int);

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

+23 −23
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ public class DvbtFrontendSettings extends FrontendSettings { 
    /** @hide */

    @IntDef(flag = true,

            prefix = "CONSTELLATION_",

            value = {CONSTELLATION_UNDEFINED, CONSTELLATION_AUTO, CONSTELLATION_CONSTELLATION_QPSK,

                    CONSTELLATION_CONSTELLATION_16QAM, CONSTELLATION_CONSTELLATION_64QAM,

                    CONSTELLATION_CONSTELLATION_256QAM})

            value = {CONSTELLATION_UNDEFINED, CONSTELLATION_AUTO, CONSTELLATION_QPSK,

                    CONSTELLATION_16QAM, CONSTELLATION_64QAM,

                    CONSTELLATION_256QAM})

    @Retention(RetentionPolicy.SOURCE)

    public @interface Constellation {}
@@ -142,22 +142,22 @@ public class DvbtFrontendSettings extends FrontendSettings { 
    /**

     * QPSK Constellation.

     */

    public static final int CONSTELLATION_CONSTELLATION_QPSK =

    public static final int CONSTELLATION_QPSK =

            Constants.FrontendDvbtConstellation.CONSTELLATION_QPSK;

    /**

     * 16QAM Constellation.

     */

    public static final int CONSTELLATION_CONSTELLATION_16QAM =

    public static final int CONSTELLATION_16QAM =

            Constants.FrontendDvbtConstellation.CONSTELLATION_16QAM;

    /**

     * 64QAM Constellation.

     */

    public static final int CONSTELLATION_CONSTELLATION_64QAM =

    public static final int CONSTELLATION_64QAM =

            Constants.FrontendDvbtConstellation.CONSTELLATION_64QAM;

    /**

     * 256QAM Constellation.

     */

    public static final int CONSTELLATION_CONSTELLATION_256QAM =

    public static final int CONSTELLATION_256QAM =

            Constants.FrontendDvbtConstellation.CONSTELLATION_256QAM;
@@ -275,11 +275,11 @@ public class DvbtFrontendSettings extends FrontendSettings { 
    @IntDef(flag = true,

            prefix = "GUARD_INTERVAL_",

            value = {GUARD_INTERVAL_UNDEFINED, GUARD_INTERVAL_AUTO,

            GUARD_INTERVAL_INTERVAL_1_32, GUARD_INTERVAL_INTERVAL_1_16,

            GUARD_INTERVAL_INTERVAL_1_8, GUARD_INTERVAL_INTERVAL_1_4,

            GUARD_INTERVAL_INTERVAL_1_128,

            GUARD_INTERVAL_INTERVAL_19_128,

            GUARD_INTERVAL_INTERVAL_19_256})

            GUARD_INTERVAL_1_32, GUARD_INTERVAL_1_16,

            GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4,

            GUARD_INTERVAL_1_128,

            GUARD_INTERVAL_19_128,

            GUARD_INTERVAL_19_256})

    @Retention(RetentionPolicy.SOURCE)

    public @interface GuardInterval {}
@@ -295,37 +295,37 @@ public class DvbtFrontendSettings extends FrontendSettings { 
    /**

     * 1/32 Guard Interval.

     */

    public static final int GUARD_INTERVAL_INTERVAL_1_32 =

    public static final int GUARD_INTERVAL_1_32 =

            Constants.FrontendDvbtGuardInterval.INTERVAL_1_32;

    /**

     * 1/16 Guard Interval.

     */

    public static final int GUARD_INTERVAL_INTERVAL_1_16 =

    public static final int GUARD_INTERVAL_1_16 =

            Constants.FrontendDvbtGuardInterval.INTERVAL_1_16;

    /**

     * 1/8 Guard Interval.

     */

    public static final int GUARD_INTERVAL_INTERVAL_1_8 =

    public static final int GUARD_INTERVAL_1_8 =

            Constants.FrontendDvbtGuardInterval.INTERVAL_1_8;

    /**

     * 1/4 Guard Interval.

     */

    public static final int GUARD_INTERVAL_INTERVAL_1_4 =

    public static final int GUARD_INTERVAL_1_4 =

            Constants.FrontendDvbtGuardInterval.INTERVAL_1_4;

    /**

     * 1/128 Guard Interval.

     */

    public static final int GUARD_INTERVAL_INTERVAL_1_128 =

    public static final int GUARD_INTERVAL_1_128 =

            Constants.FrontendDvbtGuardInterval.INTERVAL_1_128;

    /**

     * 19/128 Guard Interval.

     */

    public static final int GUARD_INTERVAL_INTERVAL_19_128 =

    public static final int GUARD_INTERVAL_19_128 =

            Constants.FrontendDvbtGuardInterval.INTERVAL_19_128;

    /**

     * 19/256 Guard Interval.

     */

    public static final int GUARD_INTERVAL_INTERVAL_19_256 =

    public static final int GUARD_INTERVAL_19_256 =

            Constants.FrontendDvbtGuardInterval.INTERVAL_19_256;



    /** @hide */
@@ -435,14 +435,14 @@ public class DvbtFrontendSettings extends FrontendSettings { 
     * Gets Code Rate for High Priority level.

     */

    @CodeRate

    public int getHpCodeRate() {

    public int getHighPriorityCodeRate() {

        return mHpCodeRate;

    }

    /**

     * Gets Code Rate for Low Priority level.

     */

    @CodeRate

    public int getLpCodeRate() {

    public int getLowPriorityCodeRate() {

        return mLpCodeRate;

    }

    /**
@@ -560,7 +560,7 @@ public class DvbtFrontendSettings extends FrontendSettings { 
         * Sets Code Rate for High Priority level.

         */

        @NonNull

        public Builder setHpCodeRate(@CodeRate int hpCodeRate) {

        public Builder setHighPriorityCodeRate(@CodeRate int hpCodeRate) {

            mHpCodeRate = hpCodeRate;

            return this;

        }
@@ -568,7 +568,7 @@ public class DvbtFrontendSettings extends FrontendSettings { 
         * Sets Code Rate for Low Priority level.

         */

        @NonNull

        public Builder setLpCodeRate(@CodeRate int lpCodeRate) {

        public Builder setLowPriorityCodeRate(@CodeRate int lpCodeRate) {

            mLpCodeRate = lpCodeRate;

            return this;

        }