Merge "Tuner API: remove builder of filter/Settings.java" into rvc-dev am: 9f81230589 (49d82cd3) · Commits · e / os / android_frameworks_base

api/system-current.txt

+5 −8

Original line number	Diff line number	Diff line
		@@ -5001,7 +5001,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);
		}
		@@ -5019,7 +5019,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);
		}
		@@ -5185,7 +5185,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);
		@@ -5205,7 +5205,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);
		@@ -5241,9 +5241,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();
		@@ -5698,7 +5695,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();

media/java/android/media/tv/tuner/filter/AvSettings.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}
		}

media/java/android/media/tv/tuner/filter/DownloadSettings.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}
		}

media/java/android/media/tv/tuner/filter/RecordSettings.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

		}

media/java/android/media/tv/tuner/filter/SectionSettings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/**