Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: If34ee3ee5717110bef2a9faebc0dede982ee6a2f
This commit is contained in:
Automerger Merge Worker
2020-03-17 01:34:03 +00:00
parent 5ba2346ade ca27edc930
commit acec264b5f
11 changed files with 135 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
api/system-current.txt
View File

@@ -5363,8 +5363,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);
}
@@ -5428,10 +5429,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[]);
}
@@ -5472,8 +5474,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);
}
@@ -5511,9 +5514,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);
@@ -5589,9 +5593,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);
@@ -5688,10 +5693,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);
@@ -5772,10 +5778,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();
@@ -5867,9 +5869,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);
@@ -5909,9 +5912,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);
@@ -5954,10 +5958,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);

19
media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java
View File

@@ -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;
}
}
}

19
media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java
View File

@@ -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

19
media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java
View File

@@ -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

19
media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java
View File

@@ -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

19
media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java
View File

@@ -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.Nullable;
import android.annotation.RequiresPermission;
@@ -303,7 +304,8 @@ public class DvbsFrontendSettings extends FrontendSettings {
/**
* Builder for {@link DvbsFrontendSettings}.
*/
public static class Builder extends FrontendSettings.Builder<Builder> {
public static class Builder {
private int mFrequency;
private int mModulation;
private DvbsCodeRate mCodeRate;
private int mSymbolRate;
@@ -316,6 +318,16 @@ public class DvbsFrontendSettings extends FrontendSettings {
private Builder() {
}
/**
* Sets frequency in Hz.
*/
@NonNull
@IntRange(from = 1)
public Builder setFrequency(int frequency) {
mFrequency = frequency;
return this;
}
/**
* Sets Modulation.
*/
@@ -389,11 +401,6 @@ public class DvbsFrontendSettings extends FrontendSettings {
return new DvbsFrontendSettings(mFrequency, mModulation, mCodeRate, mSymbolRate,
mRolloff, mPilot, mInputStreamId, mStandard, mVcmMode);
}
@Override
Builder self() {
return this;
}
}
@Override

19
media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java
View File

@@ -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;
@@ -506,7 +507,8 @@ public class DvbtFrontendSettings extends FrontendSettings {
/**
* Builder for {@link DvbtFrontendSettings}.
*/
public static class Builder extends FrontendSettings.Builder<Builder> {
public static class Builder {
private int mFrequency;
private int mTransmissionMode;
private int mBandwidth;
private int mConstellation;
@@ -524,6 +526,16 @@ public class DvbtFrontendSettings extends FrontendSettings {
private Builder() {
}
/**
* Sets frequency in Hz.
*/
@NonNull
@IntRange(from = 1)
public Builder setFrequency(int frequency) {
mFrequency = frequency;
return this;
}
/**
* Sets Transmission Mode.
*/
@@ -638,11 +650,6 @@ public class DvbtFrontendSettings extends FrontendSettings {
mConstellation, mHierarchy, mHpCodeRate, mLpCodeRate, mGuardInterval,
mIsHighPriority, mStandard, mIsMiso, mPlpMode, mPlpId, mPlpGroupId);
}
@Override
Builder self() {
return this;
}
}
@Override

25
media/java/android/media/tv/tuner/frontend/FrontendSettings.java
View File

@@ -17,9 +17,7 @@
package android.media.tv.tuner.frontend;
import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.LongDef;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.hardware.tv.tuner.V1_0.Constants;
@@ -265,27 +263,4 @@ public abstract class FrontendSettings {
public int getFrequency() {
return mFrequency;
}
/**
* Builder for {@link FrontendSettings}.
*
* @param <T> The subclass to be built.
*/
public abstract static class Builder<T extends Builder<T>> {
/* package */ int mFrequency;
/* package */ Builder() {}
/**
* Sets frequency in Hz.
*/
@NonNull
@IntRange(from = 1)
public T setFrequency(int frequency) {
mFrequency = frequency;
return self();
}
/* package */ abstract T self();
}
}

19
media/java/android/media/tv/tuner/frontend/Isdbs3FrontendSettings.java
View File

@@ -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;
@@ -224,7 +225,8 @@ public class Isdbs3FrontendSettings extends FrontendSettings {
/**
* Builder for {@link Isdbs3FrontendSettings}.
*/
public static class Builder extends FrontendSettings.Builder<Builder> {
public static class Builder {
private int mFrequency;
private int mStreamId;
private int mStreamIdType;
private int mModulation;
@@ -235,6 +237,16 @@ public class Isdbs3FrontendSettings extends FrontendSettings {
private Builder() {
}
/**
* Sets frequency in Hz.
*/
@NonNull
@IntRange(from = 1)
public Builder setFrequency(int frequency) {
mFrequency = frequency;
return this;
}
/**
* Sets Stream ID.
*/
@@ -292,11 +304,6 @@ public class Isdbs3FrontendSettings extends FrontendSettings {
return new Isdbs3FrontendSettings(mFrequency, mStreamId, mStreamIdType, mModulation,
mCodeRate, mSymbolRate, mRolloff);
}
@Override
Builder self() {
return this;
}
}
@Override

19
media/java/android/media/tv/tuner/frontend/IsdbsFrontendSettings.java
View File

@@ -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;
@@ -208,7 +209,8 @@ public class IsdbsFrontendSettings extends FrontendSettings {
/**
* Builder for {@link IsdbsFrontendSettings}.
*/
public static class Builder extends FrontendSettings.Builder<Builder> {
public static class Builder {
private int mFrequency;
private int mStreamId;
private int mStreamIdType;
private int mModulation;
@@ -219,6 +221,16 @@ public class IsdbsFrontendSettings extends FrontendSettings {
private Builder() {
}
/**
* Sets frequency in Hz.
*/
@NonNull
@IntRange(from = 1)
public Builder setFrequency(int frequency) {
mFrequency = frequency;
return this;
}
/**
* Sets Stream ID.
*/
@@ -276,11 +288,6 @@ public class IsdbsFrontendSettings extends FrontendSettings {
return new IsdbsFrontendSettings(mFrequency, mStreamId, mStreamIdType, mModulation,
mCodeRate, mSymbolRate, mRolloff);
}
@Override
Builder self() {
return this;
}
}
@Override

19
media/java/android/media/tv/tuner/frontend/IsdbtFrontendSettings.java
View File

@@ -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;
@@ -202,7 +203,8 @@ public class IsdbtFrontendSettings extends FrontendSettings {
/**
* Builder for {@link IsdbtFrontendSettings}.
*/
public static class Builder extends FrontendSettings.Builder<Builder> {
public static class Builder {
private int mFrequency;
private int mModulation;
private int mBandwidth;
private int mMode;
@@ -213,6 +215,16 @@ public class IsdbtFrontendSettings extends FrontendSettings {
private Builder() {
}
/**
* Sets frequency in Hz.
*/
@NonNull
@IntRange(from = 1)
public Builder setFrequency(int frequency) {
mFrequency = frequency;
return this;
}
/**
* Sets Modulation.
*/
@@ -270,11 +282,6 @@ public class IsdbtFrontendSettings extends FrontendSettings {
return new IsdbtFrontendSettings(mFrequency, mModulation, mBandwidth, mMode, mCodeRate,
mGuardInterval, mServiceAreaId);
}
@Override
Builder self() {
return this;
}
}
@Override