Merge "Final cleanup: Add missing fields in SectionSettings and DemuxCaps" (2d74e7f8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+17 −6

Original line number	Diff line number	Diff line
		@@ -4720,6 +4720,7 @@ package android.media.tv.tuner {
		method public long getSectionFilterLength();
		method public int getTsFilterCount();
		method public int getVideoFilterCount();
		method public boolean isTimeFilterSupported();
		}

		public class Descrambler implements java.lang.AutoCloseable {
		@@ -4765,7 +4766,7 @@ package android.media.tv.tuner {
		public class Tuner implements java.lang.AutoCloseable {
		ctor @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public Tuner(@NonNull android.content.Context, @NonNull String, int, @Nullable android.media.tv.tuner.Tuner.OnResourceLostListener);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void clearOnTuneEventListener();
		method public void close();
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void close();
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int connectCiCam(int);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int disconnectCiCam();
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int getAvSyncHwId(@NonNull android.media.tv.tuner.filter.Filter);
		@@ -4783,10 +4784,11 @@ package android.media.tv.tuner {
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int scan(@NonNull android.media.tv.tuner.frontend.FrontendSettings, int, @NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.ScanCallback);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int setLna(boolean);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void setOnTuneEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.OnTuneEventListener);
		method public void shareFrontendFromTuner(@NonNull android.media.tv.tuner.Tuner);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void shareFrontendFromTuner(@NonNull android.media.tv.tuner.Tuner);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int stopScan();
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int stopTune();
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int tune(@NonNull android.media.tv.tuner.frontend.FrontendSettings);
		method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void updateResourcePriority(int, int);
		}

		public static interface Tuner.OnResourceLostListener {
		@@ -5106,7 +5108,16 @@ package android.media.tv.tuner.filter {
		method public int getVersion();
		}

		public class SectionSettings extends android.media.tv.tuner.filter.Settings {
		public abstract class SectionSettings extends android.media.tv.tuner.filter.Settings {
		method public boolean isCrcEnabled();
		method public boolean isRaw();
		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>> {
		method @NonNull public T setCrcEnabled(boolean);
		method @NonNull public T setRaw(boolean);
		method @NonNull public T setRepeat(boolean);
		}

		public class SectionSettingsWithSectionBits extends android.media.tv.tuner.filter.SectionSettings {
		@@ -5116,7 +5127,7 @@ package android.media.tv.tuner.filter {
		method @NonNull public byte[] getMode();
		}

		public static class SectionSettingsWithSectionBits.Builder extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.SectionSettingsWithSectionBits.Builder> {
		public static class SectionSettingsWithSectionBits.Builder extends android.media.tv.tuner.filter.SectionSettings.Builder<android.media.tv.tuner.filter.SectionSettingsWithSectionBits.Builder> {
		method @NonNull public android.media.tv.tuner.filter.SectionSettingsWithSectionBits build();
		method @NonNull public android.media.tv.tuner.filter.SectionSettingsWithSectionBits.Builder setFilter(@NonNull byte[]);
		method @NonNull public android.media.tv.tuner.filter.SectionSettingsWithSectionBits.Builder setMask(@NonNull byte[]);
		@@ -5129,7 +5140,7 @@ package android.media.tv.tuner.filter {
		method public int getVersion();
		}

		public static class SectionSettingsWithTableInfo.Builder extends android.media.tv.tuner.filter.Settings.Builder<android.media.tv.tuner.filter.SectionSettingsWithTableInfo.Builder> {
		public static class SectionSettingsWithTableInfo.Builder extends android.media.tv.tuner.filter.SectionSettings.Builder<android.media.tv.tuner.filter.SectionSettingsWithTableInfo.Builder> {
		method @NonNull public android.media.tv.tuner.filter.SectionSettingsWithTableInfo build();
		method @NonNull public android.media.tv.tuner.filter.SectionSettingsWithTableInfo.Builder setTableId(int);
		method @NonNull public android.media.tv.tuner.filter.SectionSettingsWithTableInfo.Builder setVersion(int);
		@@ -5167,7 +5178,7 @@ package android.media.tv.tuner.filter {

		public static class TlvFilterConfiguration.Builder extends android.media.tv.tuner.filter.FilterConfiguration.Builder<android.media.tv.tuner.filter.TlvFilterConfiguration.Builder> {
		method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration build();
		method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration.Builder setIsCompressedIpPacket(boolean);
		method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration.Builder setCompressedIpPacket(boolean);
		method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration.Builder setPacketType(int);
		method @NonNull public android.media.tv.tuner.filter.TlvFilterConfiguration.Builder setPassthrough(boolean);
		}

media/java/android/media/tv/tuner/DemuxCapabilities.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -58,11 +58,13 @@ public class DemuxCapabilities {
		private final long mSectionFilterLength;
		private final int mFilterCaps;
		private final int[] mLinkCaps;
		private final boolean mSupportTimeFilter;

		// Used by JNI
		private DemuxCapabilities(int demuxCount, int recordCount, int playbackCount, int tsFilterCount,
		int sectionFilterCount, int audioFilterCount, int videoFilterCount, int pesFilterCount,
		int pcrFilterCount, long sectionFilterLength, int filterCaps, int[] linkCaps) {
		int pcrFilterCount, long sectionFilterLength, int filterCaps, int[] linkCaps,
		boolean timeFilter) {
		mDemuxCount = demuxCount;
		mRecordCount = recordCount;
		mPlaybackCount = playbackCount;
		@@ -75,6 +77,7 @@ public class DemuxCapabilities {
		mSectionFilterLength = sectionFilterLength;
		mFilterCaps = filterCaps;
		mLinkCaps = linkCaps;
		mSupportTimeFilter = timeFilter;
		}

		/**
		@@ -161,4 +164,10 @@ public class DemuxCapabilities {
		public int[] getLinkCapabilities() {
		return mLinkCaps;
		}
		/**
		* Is {@link android.media.tv.tuner.filter.TimeFilter} supported.
		*/
		public boolean isTimeFilterSupported() {
		return mSupportTimeFilter;
		}
		}

media/java/android/media/tv/tuner/Tuner.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -105,16 +105,33 @@ public class Tuner implements AutoCloseable {
		*
		* @param tuner the Tuner instance to share frontend resource with.
		*/
		@RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)
		public void shareFrontendFromTuner(@NonNull Tuner tuner) {
		// TODO: implementation.
		}

		/**
		* Updates client priority with an arbitrary value along with a nice value.
		*
		* <p>Tuner resource manager (TRM) uses the client priority value to decide whether it is able
		* to reclaim insufficient resources from another client.
		* <p>The nice value represents how much the client intends to give up the resource when an
		* insufficient resource situation happens.
		*
		* @param priority the new priority.
		* @param niceValue the nice value.
		*/
		@RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)
		public void updateResourcePriority(int priority, int niceValue) {
		// TODO: implementation.
		}

		private long mNativeContext; // used by native jMediaTuner

		/**
		* Releases the Tuner instance.
		*/
		@RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)
		@Override
		public void close() {
		// TODO: implementation.

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,20 @@ public class MediaEvent extends FilterEvent{
		return mDataId;
		}

		/**
		* Reserves the ID which is used by HAL to provide additional information for AV data.
		*
		* <p>The corresponding data is used and released by {@link android.media.AudioTrack}.
		* <p>The data is also released when the {@link Filter} instance is closed.
		*
		* @return the reserved AV data ID.
		* @hide
		*/
		public long reserveAvDataId() {
		// TODO: implement
		return mDataId;
		}

		/**
		* Gets MPU sequence number of filtered data.
		*/

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

+2 −0

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

		import android.annotation.BytesLong;
		import android.annotation.SystemApi;
		import android.media.tv.tuner.filter.RecordSettings.ScHevcIndex;

		/**
		* Filter event sent from {@link Filter} objects with MMTP type.
		@@ -38,6 +39,7 @@ public class MmtpRecordEvent extends FilterEvent {
		/**
		* Gets indexes which can be tagged by NAL unit group in HEVC according to ISO/IEC 23008-2.
		*/
		@ScHevcIndex
		public int getScHevcIndexMask() {
		return mScHevcIndexMask;
		}