Merge "Tuner API: remove TsFilterConfiguration.Builder" into rvc-dev am: abda4964c5 (53feb49f) · Commits · e / os / android_frameworks_base

api/system-current.txt

+15 −14

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

+13 −7

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package android.media.tv.tuner.filter;

	import android.annotation.IntDef;		import android.annotation.IntDef;
	import android.annotation.NonNull;		import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.annotation.RequiresPermission;		import android.annotation.RequiresPermission;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.content.Context;		import android.content.Context;
	@@ -33,7 +34,7 @@ import java.lang.annotation.RetentionPolicy;
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public class AlpFilterConfiguration extends FilterConfiguration {		public final class AlpFilterConfiguration extends FilterConfiguration {
	/**		/**
	* IPv4 packet type.		* IPv4 packet type.
	*/		*/
	@@ -123,9 +124,10 @@ public class AlpFilterConfiguration extends FilterConfiguration {
	/**		/**
	* Builder for {@link AlpFilterConfiguration}.		* Builder for {@link AlpFilterConfiguration}.
	*/		*/
	public static class Builder extends FilterConfiguration.Builder<Builder> {		public static final class Builder {
	private int mPacketType;		private int mPacketType;
	private int mLengthType;		private int mLengthType;
			private Settings mSettings;

	private Builder() {		private Builder() {
	}		}
	@@ -149,6 +151,15 @@ public class AlpFilterConfiguration extends FilterConfiguration {
	return this;		return this;
	}		}

			/**
			* Sets filter settings.
			*/
			@NonNull
			public Builder setSettings(@Nullable Settings settings) {
			mSettings = settings;
			return this;
			}

	/**		/**
	* Builds a {@link AlpFilterConfiguration} object.		* Builds a {@link AlpFilterConfiguration} object.
	*/		*/
	@@ -156,10 +167,5 @@ public class AlpFilterConfiguration extends FilterConfiguration {
	public AlpFilterConfiguration build() {		public AlpFilterConfiguration build() {
	return new AlpFilterConfiguration(mSettings, mPacketType, mLengthType);		return new AlpFilterConfiguration(mSettings, mPacketType, mLengthType);
	}		}

	@Override
	Builder self() {
	return this;
	}
	}		}
	}		}

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

+0 −23

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	package android.media.tv.tuner.filter;		package android.media.tv.tuner.filter;

	import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;

	@@ -48,26 +47,4 @@ public abstract class FilterConfiguration {
	public Settings getSettings() {		public Settings getSettings() {
	return mSettings;		return mSettings;
	}		}

	/**
	* Builder for {@link FilterConfiguration}.
	*
	* @param <T> The subclass to be built.
	*/
	public abstract static class Builder<T extends Builder<T>> {
	/* package */ Settings mSettings;

	/* package */ Builder() {
	}

	/**
	* Sets filter settings.
	*/
	@NonNull
	public T setSettings(@Nullable Settings settings) {
	mSettings = settings;
	return self();
	}
	/* package */ abstract T self();
	}
	}		}

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

+13 −7

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package android.media.tv.tuner.filter;		package android.media.tv.tuner.filter;

	import android.annotation.NonNull;		import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.annotation.RequiresPermission;		import android.annotation.RequiresPermission;
	import android.annotation.Size;		import android.annotation.Size;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	@@ -29,7 +30,7 @@ import android.media.tv.tuner.TunerUtils;
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public class IpFilterConfiguration extends FilterConfiguration {		public final class IpFilterConfiguration extends FilterConfiguration {
	private final byte[] mSrcIpAddress;		private final byte[] mSrcIpAddress;
	private final byte[] mDstIpAddress;		private final byte[] mDstIpAddress;
	private final int mSrcPort;		private final int mSrcPort;
	@@ -104,12 +105,13 @@ public class IpFilterConfiguration extends FilterConfiguration {
	/**		/**
	* Builder for {@link IpFilterConfiguration}.		* Builder for {@link IpFilterConfiguration}.
	*/		*/
	public static class Builder extends FilterConfiguration.Builder<Builder> {		public static final class Builder {
	private byte[] mSrcIpAddress;		private byte[] mSrcIpAddress;
	private byte[] mDstIpAddress;		private byte[] mDstIpAddress;
	private int mSrcPort;		private int mSrcPort;
	private int mDstPort;		private int mDstPort;
	private boolean mPassthrough;		private boolean mPassthrough;
			private Settings mSettings;

	private Builder() {		private Builder() {
	}		}
	@@ -155,6 +157,15 @@ public class IpFilterConfiguration extends FilterConfiguration {
	return this;		return this;
	}		}

			/**
			* Sets filter settings.
			*/
			@NonNull
			public Builder setSettings(@Nullable Settings settings) {
			mSettings = settings;
			return this;
			}

	/**		/**
	* Builds a {@link IpFilterConfiguration} object.		* Builds a {@link IpFilterConfiguration} object.
	*/		*/
	@@ -169,10 +180,5 @@ public class IpFilterConfiguration extends FilterConfiguration {
	return new IpFilterConfiguration(		return new IpFilterConfiguration(
	mSettings, mSrcIpAddress, mDstIpAddress, mSrcPort, mDstPort, mPassthrough);		mSettings, mSrcIpAddress, mDstIpAddress, mSrcPort, mDstPort, mPassthrough);
	}		}

	@Override
	Builder self() {
	return this;
	}
	}		}
	}		}

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

+13 −7

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package android.media.tv.tuner.filter;		package android.media.tv.tuner.filter;

	import android.annotation.NonNull;		import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.annotation.RequiresPermission;		import android.annotation.RequiresPermission;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.content.Context;		import android.content.Context;
	@@ -28,7 +29,7 @@ import android.media.tv.tuner.TunerUtils;
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public class MmtpFilterConfiguration extends FilterConfiguration {		public final class MmtpFilterConfiguration extends FilterConfiguration {
	private final int mMmtpPid;		private final int mMmtpPid;

	private MmtpFilterConfiguration(Settings settings, int mmtpPid) {		private MmtpFilterConfiguration(Settings settings, int mmtpPid) {
	@@ -65,8 +66,9 @@ public class MmtpFilterConfiguration extends FilterConfiguration {
	/**		/**
	* Builder for {@link IpFilterConfiguration}.		* Builder for {@link IpFilterConfiguration}.
	*/		*/
	public static class Builder extends FilterConfiguration.Builder<Builder> {		public static final class Builder {
	private int mMmtpPid;		private int mMmtpPid;
			private Settings mSettings;

	private Builder() {		private Builder() {
	}		}
	@@ -80,6 +82,15 @@ public class MmtpFilterConfiguration extends FilterConfiguration {
	return this;		return this;
	}		}

			/**
			* Sets filter settings.
			*/
			@NonNull
			public Builder setSettings(@Nullable Settings settings) {
			mSettings = settings;
			return this;
			}

	/**		/**
	* Builds a {@link IpFilterConfiguration} object.		* Builds a {@link IpFilterConfiguration} object.
	*/		*/
	@@ -87,10 +98,5 @@ public class MmtpFilterConfiguration extends FilterConfiguration {
	public MmtpFilterConfiguration build() {		public MmtpFilterConfiguration build() {
	return new MmtpFilterConfiguration(mSettings, mMmtpPid);		return new MmtpFilterConfiguration(mSettings, mMmtpPid);
	}		}

	@Override
	Builder self() {
	return this;
	}
	}		}
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -4983,7 +4983,7 @@ package android.media.tv.tuner.dvr {

	package android.media.tv.tuner.filter {		package android.media.tv.tuner.filter {

	public class AlpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {		public final class AlpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
	method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.AlpFilterConfiguration.Builder builder(@NonNull android.content.Context);		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.AlpFilterConfiguration.Builder builder(@NonNull android.content.Context);
	method public int getLengthType();		method public int getLengthType();
	method public int getPacketType();		method public int getPacketType();
	@@ -4998,10 +4998,11 @@ package android.media.tv.tuner.filter {
	field public static final int PACKET_TYPE_SIGNALING = 4; // 0x4		field public static final int PACKET_TYPE_SIGNALING = 4; // 0x4
	}		}

	public static class AlpFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder<android.media.tv.tuner.filter.AlpFilterConfiguration.Builder> {		public static final class AlpFilterConfiguration.Builder {
	method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration build();		method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration build();
	method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration.Builder setLengthType(int);		method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration.Builder setLengthType(int);
	method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration.Builder setPacketType(int);		method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration.Builder setPacketType(int);
			method @NonNull public android.media.tv.tuner.filter.AlpFilterConfiguration.Builder setSettings(@Nullable android.media.tv.tuner.filter.Settings);
	}		}

	public class AudioDescriptor {		public class AudioDescriptor {
	@@ -5089,15 +5090,11 @@ package android.media.tv.tuner.filter {
	method public abstract int getType();		method public abstract int getType();
	}		}

	public abstract static class FilterConfiguration.Builder<T extends android.media.tv.tuner.filter.FilterConfiguration.Builder<T>> {
	method @NonNull public T setSettings(@Nullable android.media.tv.tuner.filter.Settings);
	}

	public abstract class FilterEvent {		public abstract class FilterEvent {
	ctor public FilterEvent();		ctor public FilterEvent();
	}		}

	public class IpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {		public final class IpFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
	method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.IpFilterConfiguration.Builder builder(@NonNull android.content.Context);		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.IpFilterConfiguration.Builder builder(@NonNull android.content.Context);
	method @NonNull @Size(min=4, max=16) public byte[] getDstIpAddress();		method @NonNull @Size(min=4, max=16) public byte[] getDstIpAddress();
	method public int getDstPort();		method public int getDstPort();
	@@ -5107,11 +5104,12 @@ package android.media.tv.tuner.filter {
	method public boolean isPassthrough();		method public boolean isPassthrough();
	}		}