Merge "Unhide FilterConfiguration part 1" (1dad0a01) · Commits · e / os / android_frameworks_base

api/system-current.txt

+36 −0

Original line number	Diff line number	Diff line
		@@ -4687,10 +4687,30 @@ package android.media.tv.tuner {

		package android.media.tv.tuner.filter {

		public abstract class FilterConfiguration {
		field public static final int FILTER_TYPE_ALP = 16; // 0x10
		field public static final int FILTER_TYPE_IP = 4; // 0x4
		field public static final int FILTER_TYPE_MMTP = 2; // 0x2
		field public static final int FILTER_TYPE_TLV = 8; // 0x8
		field public static final int FILTER_TYPE_TS = 1; // 0x1
		}

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

		public class PesSettings extends android.media.tv.tuner.filter.Settings {
		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.PesSettings.Builder builder(@NonNull android.content.Context, int);
		method public int getStreamId();
		method public boolean isRaw();
		}

		public static class PesSettings.Builder {
		method @NonNull public android.media.tv.tuner.filter.PesSettings build();
		method @NonNull public android.media.tv.tuner.filter.PesSettings.Builder setRaw(boolean);
		method @NonNull public android.media.tv.tuner.filter.PesSettings.Builder setStreamId(int);
		}

		public class SectionEvent extends android.media.tv.tuner.filter.FilterEvent {
		method public int getDataLength();
		method public int getSectionNumber();
		@@ -4698,6 +4718,22 @@ package android.media.tv.tuner.filter {
		method public int getVersion();
		}

		public abstract class Settings {
		}

		public class TsFilterConfiguration extends android.media.tv.tuner.filter.FilterConfiguration {
		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.filter.TsFilterConfiguration.Builder builder(@NonNull android.content.Context);
		method @Nullable public android.media.tv.tuner.filter.Settings getSettings();
		method public int getTpid();
		method public int getType();
		}

		public static class TsFilterConfiguration.Builder {
		method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration build();
		method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration.Builder setSettings(@NonNull android.media.tv.tuner.filter.Settings);
		method @NonNull public android.media.tv.tuner.filter.TsFilterConfiguration.Builder setTpid(int);
		}

		}

		package android.metrics {

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

+3 −1

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

		import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.hardware.tv.tuner.V1_0.Constants;

		import java.lang.annotation.Retention;
		@@ -28,6 +29,7 @@ import java.lang.annotation.RetentionPolicy;
		*
		* @hide
		*/
		@SystemApi
		public abstract class FilterConfiguration {

		/** @hide */
		@@ -57,7 +59,7 @@ public abstract class FilterConfiguration {
		public static final int FILTER_TYPE_ALP = Constants.DemuxFilterMainType.ALP;

		@Nullable
		private final Settings mSettings;
		/* package */ final Settings mSettings;

		/* package */ FilterConfiguration(Settings settings) {
		mSettings = settings;

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

+27 −3

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

		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.content.Context;
		import android.media.tv.tuner.TunerConstants;
		import android.media.tv.tuner.TunerUtils;
		import android.media.tv.tuner.filter.FilterConfiguration.FilterType;
		@@ -26,6 +29,7 @@ import android.media.tv.tuner.filter.FilterConfiguration.FilterType;
		*
		* @hide
		*/
		@SystemApi
		public class PesSettings extends Settings {
		private final int mStreamId;
		private final boolean mIsRaw;
		@@ -36,13 +40,33 @@ public class PesSettings extends Settings {
		mIsRaw = isRaw;
		}

		/**
		* Gets stream ID.
		*/
		public int getStreamId() {
		return mStreamId;
		}

		/**
		* Returns whether the data is raw.
		*
		* @return {@code true} if the data is raw. Filter sends onFilterStatus callback
		* instead of onFilterEvent for raw data. {@code false} otherwise.
		*/
		public boolean isRaw() {
		return mIsRaw;
		}

		/**
		* Creates a builder for {@link PesSettings}.
		*
		* @param mainType the filter main type of the settings.
		* @param context the context of the caller.
		*/
		@RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)
		@NonNull
		public static Builder newBuilder(@FilterType int mainType) {
		public static Builder builder(@NonNull Context context, @FilterType int mainType) {
		TunerUtils.checkTunerPermission(context);
		return new Builder(mainType);
		}

		@@ -70,13 +94,13 @@ public class PesSettings extends Settings {
		}

		/**
		* Sets whether it's raw.
		* Sets whether the data is raw.
		*
		* @param isRaw {@code true} if the data is raw. Filter sends onFilterStatus callback
		* instead of onFilterEvent for raw data. {@code false} otherwise.
		*/
		@NonNull
		public Builder setIsRaw(boolean isRaw) {
		public Builder setRaw(boolean isRaw) {
		mIsRaw = isRaw;
		return this;
		}

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,11 +16,14 @@

		package android.media.tv.tuner.filter;

		import android.annotation.SystemApi;

		/**
		* Settings for filters of different subtypes.
		*
		* @hide
		*/
		@SystemApi
		public abstract class Settings {
		private final int mType;

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

+28 −1

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

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.content.Context;
		import android.media.tv.tuner.TunerUtils;

		/**
		* Filter configuration for a TS filter.
		*
		* @hide
		*/
		@SystemApi
		public class TsFilterConfiguration extends FilterConfiguration {
		private final int mTpid;

		@@ -36,11 +42,29 @@ public class TsFilterConfiguration extends FilterConfiguration {
		return FilterConfiguration.FILTER_TYPE_TS;
		}

		/**
		* Gets the {@link Settings} object of this filter configuration.
		*/
		@Nullable
		public Settings getSettings() {
		return mSettings;
		}
		/**
		* Gets Tag Protocol ID.
		*/
		public int getTpid() {
		return mTpid;
		}

		/**
		* Creates a builder for {@link TsFilterConfiguration}.
		*
		* @param context the context of the caller.
		*/
		@RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)
		@NonNull
		public static Builder newBuilder() {
		public static Builder builder(@NonNull Context context) {
		TunerUtils.checkTunerPermission(context);
		return new Builder();
		}

		@@ -51,6 +75,9 @@ public class TsFilterConfiguration extends FilterConfiguration {
		private Settings mSettings;
		private int mTpid;

		private Builder() {
		}

		/**
		* Sets filter settings.
		*