diff options
8 files changed, 27 insertions, 51 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index fd3798908d1e..ea9856b8301b 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5010,7 +5010,7 @@ package android.media.tv.tuner.filter { method public boolean isPassthrough(); } - public static class AvSettings.Builder extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.AvSettings.Builder> { + public static class AvSettings.Builder { method @NonNull public android.media.tv.tuner.filter.AvSettings build(); method @NonNull public android.media.tv.tuner.filter.AvSettings.Builder setPassthrough(boolean); } @@ -5028,7 +5028,7 @@ package android.media.tv.tuner.filter { method public int getDownloadId(); } - public static class DownloadSettings.Builder extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.DownloadSettings.Builder> { + public static class DownloadSettings.Builder { method @NonNull public android.media.tv.tuner.filter.DownloadSettings build(); method @NonNull public android.media.tv.tuner.filter.DownloadSettings.Builder setDownloadId(int); } @@ -5194,7 +5194,7 @@ package android.media.tv.tuner.filter { field public static final int TS_INDEX_SPLICING_POINT_FLAG = 1024; // 0x400 } - public static class RecordSettings.Builder extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.RecordSettings.Builder> { + public static class RecordSettings.Builder { method @NonNull public android.media.tv.tuner.filter.RecordSettings build(); method @NonNull public android.media.tv.tuner.filter.RecordSettings.Builder setScIndexMask(int); method @NonNull public android.media.tv.tuner.filter.RecordSettings.Builder setScIndexType(int); @@ -5214,7 +5214,7 @@ package android.media.tv.tuner.filter { method public boolean isRepeat(); } - public abstract static class SectionSettings.Builder<T extends android.media.tv.tuner.filter.SectionSettings.Builder<T>> extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.SectionSettings.Builder<T>> { + public abstract static class SectionSettings.Builder<T extends android.media.tv.tuner.filter.SectionSettings.Builder<T>> { method @NonNull public T setCrcEnabled(boolean); method @NonNull public T setRaw(boolean); method @NonNull public T setRepeat(boolean); @@ -5250,9 +5250,6 @@ package android.media.tv.tuner.filter { method public int getType(); } - public abstract static class Settings.Builder<T extends android.media.tv.tuner.filter.Settings.Builder<T>> { - } - public class TemiEvent extends android.media.tv.tuner.filter.FilterEvent { method @NonNull public byte[] getDescriptorData(); method public byte getDescriptorTag(); @@ -5707,7 +5704,7 @@ package android.media.tv.tuner.frontend { method public int getAcquireRange(); method public int getExclusiveGroupId(); method @NonNull public android.util.Range<java.lang.Integer> getFrequencyRange(); - method @NonNull public android.media.tv.tuner.frontend.FrontendCapabilities getFrontendCapability(); + method @NonNull public android.media.tv.tuner.frontend.FrontendCapabilities getFrontendCapabilities(); method public int getId(); method @NonNull public int[] getStatusCapabilities(); method @NonNull public android.util.Range<java.lang.Integer> getSymbolRateRange(); diff --git a/media/java/android/media/tv/tuner/filter/AvSettings.java b/media/java/android/media/tv/tuner/filter/AvSettings.java index bf11893e4bb3..6c95668a183c 100644 --- a/media/java/android/media/tv/tuner/filter/AvSettings.java +++ b/media/java/android/media/tv/tuner/filter/AvSettings.java @@ -65,12 +65,13 @@ public class AvSettings extends Settings { /** * Builder for {@link AvSettings}. */ - public static class Builder extends Settings.Builder<Builder> { + public static class Builder { + private final int mMainType; private final boolean mIsAudio; private boolean mIsPassthrough; private Builder(int mainType, boolean isAudio) { - super(mainType); + mMainType = mainType; mIsAudio = isAudio; } @@ -90,10 +91,5 @@ public class AvSettings extends Settings { public AvSettings build() { return new AvSettings(mMainType, mIsAudio, mIsPassthrough); } - - @Override - Builder self() { - return this; - } } } diff --git a/media/java/android/media/tv/tuner/filter/DownloadSettings.java b/media/java/android/media/tv/tuner/filter/DownloadSettings.java index 915ad79ffd5a..37884e50790d 100644 --- a/media/java/android/media/tv/tuner/filter/DownloadSettings.java +++ b/media/java/android/media/tv/tuner/filter/DownloadSettings.java @@ -59,11 +59,12 @@ public class DownloadSettings extends Settings { /** * Builder for {@link DownloadSettings}. */ - public static class Builder extends Settings.Builder<Builder> { + public static class Builder { + private final int mMainType; private int mDownloadId; private Builder(int mainType) { - super(mainType); + mMainType = mainType; } /** @@ -82,10 +83,5 @@ public class DownloadSettings extends Settings { public DownloadSettings build() { return new DownloadSettings(mMainType, mDownloadId); } - - @Override - Builder self() { - return this; - } } } diff --git a/media/java/android/media/tv/tuner/filter/RecordSettings.java b/media/java/android/media/tv/tuner/filter/RecordSettings.java index 0c812ab051bd..409978b0b153 100644 --- a/media/java/android/media/tv/tuner/filter/RecordSettings.java +++ b/media/java/android/media/tv/tuner/filter/RecordSettings.java @@ -283,13 +283,14 @@ public class RecordSettings extends Settings { /** * Builder for {@link RecordSettings}. */ - public static class Builder extends Settings.Builder<Builder> { + public static class Builder { + private final int mMainType; private int mTsIndexMask; private int mScIndexType; private int mScIndexMask; private Builder(int mainType) { - super(mainType); + mMainType = mainType; } /** @@ -324,11 +325,6 @@ public class RecordSettings extends Settings { public RecordSettings build() { return new RecordSettings(mMainType, mTsIndexMask, mScIndexType, mScIndexMask); } - - @Override - Builder self() { - return this; - } } } diff --git a/media/java/android/media/tv/tuner/filter/SectionSettings.java b/media/java/android/media/tv/tuner/filter/SectionSettings.java index 947013840bc6..58e22c907639 100644 --- a/media/java/android/media/tv/tuner/filter/SectionSettings.java +++ b/media/java/android/media/tv/tuner/filter/SectionSettings.java @@ -64,14 +64,14 @@ public abstract class SectionSettings extends Settings { * * @param <T> The subclass to be built. */ - public abstract static class Builder<T extends Builder<T>> - extends Settings.Builder<Builder<T>> { + public abstract static class Builder<T extends Builder<T>> { + final int mMainType; boolean mCrcEnabled; boolean mIsRepeat; boolean mIsRaw; Builder(int mainType) { - super(mainType); + mMainType = mainType; } /** diff --git a/media/java/android/media/tv/tuner/filter/SectionSettingsWithSectionBits.java b/media/java/android/media/tv/tuner/filter/SectionSettingsWithSectionBits.java index cb547ec8ae9a..976ad49f042d 100644 --- a/media/java/android/media/tv/tuner/filter/SectionSettingsWithSectionBits.java +++ b/media/java/android/media/tv/tuner/filter/SectionSettingsWithSectionBits.java @@ -88,9 +88,9 @@ public class SectionSettingsWithSectionBits extends SectionSettings { * Builder for {@link SectionSettingsWithSectionBits}. */ public static class Builder extends SectionSettings.Builder<Builder> { - private byte[] mFilter; - private byte[] mMask; - private byte[] mMode; + private byte[] mFilter = {}; + private byte[] mMask = {}; + private byte[] mMode = {}; private Builder(int mainType) { super(mainType); @@ -98,6 +98,8 @@ public class SectionSettingsWithSectionBits extends SectionSettings { /** * Sets filter bytes. + * + * <p>Default value is an empty byte array. */ @NonNull public Builder setFilter(@NonNull byte[] filter) { @@ -106,6 +108,8 @@ public class SectionSettingsWithSectionBits extends SectionSettings { } /** * Sets bit mask. + * + * <p>Default value is an empty byte array. */ @NonNull public Builder setMask(@NonNull byte[] mask) { @@ -114,6 +118,8 @@ public class SectionSettingsWithSectionBits extends SectionSettings { } /** * Sets mode. + * + * <p>Default value is an empty byte array. */ @NonNull public Builder setMode(@NonNull byte[] mode) { diff --git a/media/java/android/media/tv/tuner/filter/Settings.java b/media/java/android/media/tv/tuner/filter/Settings.java index fee7f66c1231..f89bc06c1291 100644 --- a/media/java/android/media/tv/tuner/filter/Settings.java +++ b/media/java/android/media/tv/tuner/filter/Settings.java @@ -37,19 +37,4 @@ public abstract class Settings { public int getType() { return mType; } - - - /** - * Builder for {@link Settings}. - * - * @param <T> The subclass to be built. - */ - public abstract static class Builder<T extends Builder<T>> { - /* package */ final int mMainType; - - /* package */ Builder(int mainType) { - mMainType = mainType; - } - /* package */ abstract T self(); - } } diff --git a/media/java/android/media/tv/tuner/frontend/FrontendInfo.java b/media/java/android/media/tv/tuner/frontend/FrontendInfo.java index 696d8390fc11..334900ba705a 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendInfo.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendInfo.java @@ -112,7 +112,7 @@ public class FrontendInfo { * Gets frontend capabilities. */ @NonNull - public FrontendCapabilities getFrontendCapability() { + public FrontendCapabilities getFrontendCapabilities() { return mFrontendCap; } } |