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

Commit 3fb57e21 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove FrontendSettings.Builder" into rvc-dev am: ca27edc9 am:... 

Merge "Remove FrontendSettings.Builder" into rvc-dev am: ca27edc9 am: acec264b am: 451684ca am: 67467430

Change-Id: I699a80ac454bbfcc9b4d9bcfcf04f0924f500efe
parents cf0bce58 67467430

api/system-current.txt

+18 −13
Original line number Diff line number Diff line
@@ -5371,8 +5371,9 @@ package android.media.tv.tuner.frontend { 
    field public static final int SIGNAL_TYPE_UNDEFINED = 0; // 0x0

  }













  public static class AnalogFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.AnalogFrontendSettings.Builder> {













  public static class AnalogFrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.AnalogFrontendSettings build();













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.AnalogFrontendSettings.Builder setFrequency(int);















    method @NonNull public android.media.tv.tuner.frontend.AnalogFrontendSettings.Builder setSifStandard(int);















    method @NonNull public android.media.tv.tuner.frontend.AnalogFrontendSettings.Builder setSignalType(int);















  }










@@ -5436,10 +5437,11 @@ package android.media.tv.tuner.frontend {













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















  }



























  public static class Atsc3FrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder> {













  public static class Atsc3FrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings build();















    method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setBandwidth(int);















    method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setDemodOutputFormat(int);













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setFrequency(int);















    method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setPlpSettings(@NonNull android.media.tv.tuner.frontend.Atsc3PlpSettings[]);















  }
























@@ -5480,8 +5482,9 @@ package android.media.tv.tuner.frontend {













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















  }



























  public static class AtscFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.AtscFrontendSettings.Builder> {













  public static class AtscFrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.AtscFrontendSettings build();













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.AtscFrontendSettings.Builder setFrequency(int);















    method @NonNull public android.media.tv.tuner.frontend.AtscFrontendSettings.Builder setModulation(int);















  }
























@@ -5519,9 +5522,10 @@ package android.media.tv.tuner.frontend {













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















  }



























  public static class DvbcFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder> {













  public static class DvbcFrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings build();















    method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setAnnex(int);













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setFrequency(int);















    method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setInnerFec(long);















    method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setModulation(int);















    method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setOuterFec(int);










@@ -5597,9 +5601,10 @@ package android.media.tv.tuner.frontend {













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















  }



























  public static class DvbsFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder> {













  public static class DvbsFrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings build();















    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setCodeRate(@Nullable android.media.tv.tuner.frontend.DvbsCodeRate);













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setFrequency(int);















    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setInputStreamId(int);















    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setModulation(int);















    method @NonNull public android.media.tv.tuner.frontend.DvbsFrontendSettings.Builder setPilot(int);










@@ -5696,10 +5701,11 @@ package android.media.tv.tuner.frontend {













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















  }



























  public static class DvbtFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder> {













  public static class DvbtFrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings build();















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















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













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.DvbtFrontendSettings.Builder setFrequency(int);















    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);










@@ -5780,10 +5786,6 @@ package android.media.tv.tuner.frontend {













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















  }



























  public abstract static class FrontendSettings.Builder<T extends android.media.tv.tuner.frontend.FrontendSettings.Builder<T>> {













    method @IntRange(from=1) @NonNull public T setFrequency(int);













  }



























  public class FrontendStatus {















    method public int getAgc();















    method @NonNull public android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpInfo[] getAtsc3PlpInfo();










@@ -5875,9 +5877,10 @@ package android.media.tv.tuner.frontend {













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















  }



























  public static class Isdbs3FrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.Isdbs3FrontendSettings.Builder> {













  public static class Isdbs3FrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.Isdbs3FrontendSettings build();















    method @NonNull public android.media.tv.tuner.frontend.Isdbs3FrontendSettings.Builder setCodeRate(int);













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.Isdbs3FrontendSettings.Builder setFrequency(int);















    method @NonNull public android.media.tv.tuner.frontend.Isdbs3FrontendSettings.Builder setModulation(int);















    method @NonNull public android.media.tv.tuner.frontend.Isdbs3FrontendSettings.Builder setRolloff(int);















    method @NonNull public android.media.tv.tuner.frontend.Isdbs3FrontendSettings.Builder setStreamId(int);










@@ -5917,9 +5920,10 @@ package android.media.tv.tuner.frontend {













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















  }



























  public static class IsdbsFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.IsdbsFrontendSettings.Builder> {













  public static class IsdbsFrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.IsdbsFrontendSettings build();















    method @NonNull public android.media.tv.tuner.frontend.IsdbsFrontendSettings.Builder setCodeRate(int);













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.IsdbsFrontendSettings.Builder setFrequency(int);















    method @NonNull public android.media.tv.tuner.frontend.IsdbsFrontendSettings.Builder setModulation(int);















    method @NonNull public android.media.tv.tuner.frontend.IsdbsFrontendSettings.Builder setRolloff(int);















    method @NonNull public android.media.tv.tuner.frontend.IsdbsFrontendSettings.Builder setStreamId(int);










@@ -5962,10 +5966,11 @@ package android.media.tv.tuner.frontend {













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















  }



























  public static class IsdbtFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder> {













  public static class IsdbtFrontendSettings.Builder {















    method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings build();















    method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder setBandwidth(int);















    method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder setCodeRate(int);













    method @IntRange(from=1) @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder setFrequency(int);















    method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder setGuardInterval(int);















    method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder setMode(int);















    method @NonNull public android.media.tv.tuner.frontend.IsdbtFrontendSettings.Builder setModulation(int);

































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



+13
−6




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.media.tv.tuner.frontend;































import android.annotation.IntDef;













import android.annotation.IntRange;















import android.annotation.NonNull;















import android.annotation.RequiresPermission;















import android.annotation.SystemApi;










@@ -213,12 +214,23 @@ public class AnalogFrontendSettings extends FrontendSettings {













    /**















     * Builder for {@link AnalogFrontendSettings}.















     */













    public static class Builder extends FrontendSettings.Builder<Builder> {













    public static class Builder {













        private int mFrequency;















        private int mSignalType;















        private int mSifStandard;































        private Builder() {}





























        /**













         * Sets frequency in Hz.













         */













        @NonNull













        @IntRange(from = 1)













        public Builder setFrequency(int frequency) {













            mFrequency = frequency;













            return this;













        }





























        /**















         * Sets analog signal type.















         */









@@ -244,10 +256,5 @@ public class AnalogFrontendSettings extends FrontendSettings {













        public AnalogFrontendSettings build() {















            return new AnalogFrontendSettings(mFrequency, mSignalType, mSifStandard);















        }



























        @Override













        Builder self() {













            return this;













        }















    }















}
























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



+13
−6




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.media.tv.tuner.frontend;































import android.annotation.IntDef;













import android.annotation.IntRange;















import android.annotation.NonNull;















import android.annotation.RequiresPermission;















import android.annotation.SystemApi;










@@ -325,7 +326,8 @@ public class Atsc3FrontendSettings extends FrontendSettings {













    /**















     * Builder for {@link Atsc3FrontendSettings}.















     */













    public static class Builder extends FrontendSettings.Builder<Builder> {













    public static class Builder {













        private int mFrequency;















        private int mBandwidth;















        private int mDemodOutputFormat;















        private Atsc3PlpSettings[] mPlpSettings;









@@ -333,6 +335,16 @@ public class Atsc3FrontendSettings extends FrontendSettings {













        private Builder() {















        }





























        /**













         * Sets frequency in Hz.













         */













        @NonNull













        @IntRange(from = 1)













        public Builder setFrequency(int frequency) {













            mFrequency = frequency;













            return this;













        }





























        /**















         * Sets bandwidth.















         */










@@ -366,11 +378,6 @@ public class Atsc3FrontendSettings extends FrontendSettings {













            return new Atsc3FrontendSettings(















                mFrequency, mBandwidth, mDemodOutputFormat, mPlpSettings);















        }



























        @Override













        Builder self() {













            return this;













        }















    }































    @Override

































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



+13
−6




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.media.tv.tuner.frontend;































import android.annotation.IntDef;













import android.annotation.IntRange;















import android.annotation.NonNull;















import android.annotation.RequiresPermission;















import android.annotation.SystemApi;










@@ -91,12 +92,23 @@ public class AtscFrontendSettings extends FrontendSettings {













    /**















     * Builder for {@link AtscFrontendSettings}.















     */













    public static class Builder extends FrontendSettings.Builder<Builder> {













    public static class Builder {













        private int mFrequency;















        private int mModulation;































        private Builder() {















        }





























        /**













         * Sets frequency in Hz.













         */













        @NonNull













        @IntRange(from = 1)













        public Builder setFrequency(int frequency) {













            mFrequency = frequency;













            return this;













        }





























        /**















         * Sets Modulation.















         */









@@ -113,11 +125,6 @@ public class AtscFrontendSettings extends FrontendSettings {













        public AtscFrontendSettings build() {















            return new AtscFrontendSettings(mFrequency, mModulation);















        }



























        @Override













        Builder self() {













            return this;













        }















    }































    @Override

































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



+13
−6




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.media.tv.tuner.frontend;































import android.annotation.IntDef;













import android.annotation.IntRange;















import android.annotation.NonNull;















import android.annotation.RequiresPermission;















import android.annotation.SystemApi;










@@ -218,7 +219,8 @@ public class DvbcFrontendSettings extends FrontendSettings {













    /**















     * Builder for {@link DvbcFrontendSettings}.















     */













    public static class Builder extends FrontendSettings.Builder<Builder> {













    public static class Builder {













        private int mFrequency;















        private int mModulation;















        private long mInnerFec;















        private int mSymbolRate;









@@ -229,6 +231,16 @@ public class DvbcFrontendSettings extends FrontendSettings {













        private Builder() {















        }





























        /**













         * Sets frequency in Hz.













         */













        @NonNull













        @IntRange(from = 1)













        public Builder setFrequency(int frequency) {













            mFrequency = frequency;













            return this;













        }





























        /**















         * Sets Modulation.















         */










@@ -286,11 +298,6 @@ public class DvbcFrontendSettings extends FrontendSettings {













            return new DvbcFrontendSettings(mFrequency, mModulation, mInnerFec, mSymbolRate,















                mOuterFec, mAnnex, mSpectralInversion);















        }



























        @Override













        Builder self() {













            return this;













        }















    }































    @Override