Merge "Improve documentation and use Long instead of 64Bits" into sc-dev (9bb2b4cc) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -5704,7 +5704,7 @@ package android.media.tv.tuner {
		method public void updateResourcePriority(int, int);
		field public static final int INVALID_AV_SYNC_ID = -1; // 0xffffffff
		field public static final int INVALID_FILTER_ID = -1; // 0xffffffff
		field public static final long INVALID_FILTER_ID_64BIT = -1L; // 0xffffffffffffffffL
		field public static final long INVALID_FILTER_ID_LONG = -1L; // 0xffffffffffffffffL
		field public static final int INVALID_FIRST_MACROBLOCK_IN_SLICE = -1; // 0xffffffff
		field public static final int INVALID_FRONTEND_ID = -1; // 0xffffffff
		field public static final int INVALID_FRONTEND_SETTING_FREQUENCY = -1; // 0xffffffff
		@@ -5885,7 +5885,7 @@ package android.media.tv.tuner.filter {
		method public int getItemFragmentIndex();
		method public int getItemId();
		method public int getLastItemFragmentIndex();
		method public int getMpuSequenceNumber();
		method @IntRange(from=0) public int getMpuSequenceNumber();
		}

		public class DownloadSettings extends android.media.tv.tuner.filter.Settings {
		@@ -5903,7 +5903,7 @@ package android.media.tv.tuner.filter {
		method public int configure(@NonNull android.media.tv.tuner.filter.FilterConfiguration);
		method public int flush();
		method public int getId();
		method public long getId64Bit();
		method public long getIdLong();
		method public int read(@NonNull byte[], long, long);
		method public int setDataSource(@Nullable android.media.tv.tuner.filter.Filter);
		method public int setMonitorEventMask(int);
		@@ -5994,7 +5994,7 @@ package android.media.tv.tuner.filter {
		method public long getDataLength();
		method @Nullable public android.media.tv.tuner.filter.AudioDescriptor getExtraMetaData();
		method @Nullable public android.media.MediaCodec.LinearBlock getLinearBlock();
		method public int getMpuSequenceNumber();
		method @IntRange(from=0) public int getMpuSequenceNumber();
		method public long getOffset();
		method public long getPts();
		method public int getStreamId();
		@@ -6019,7 +6019,7 @@ package android.media.tv.tuner.filter {
		public class MmtpRecordEvent extends android.media.tv.tuner.filter.FilterEvent {
		method public long getDataLength();
		method public int getFirstMacroblockInSlice();
		method public int getMpuSequenceNumber();
		method @IntRange(from=0) public int getMpuSequenceNumber();
		method public long getPts();
		method public int getScHevcIndexMask();
		method public int getTsIndexMask();
		@@ -6027,7 +6027,7 @@ package android.media.tv.tuner.filter {

		public class PesEvent extends android.media.tv.tuner.filter.FilterEvent {
		method public int getDataLength();
		method public int getMpuSequenceNumber();
		method @IntRange(from=0) public int getMpuSequenceNumber();
		method public int getStreamId();
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ public class Tuner implements AutoCloseable {
		/**
		* Invalid 64-bit filter ID.
		*/
		public static final long INVALID_FILTER_ID_64BIT =
		public static final long INVALID_FILTER_ID_LONG =
		android.hardware.tv.tuner.V1_1.Constants.Constant64Bit.INVALID_FILTER_ID_64BIT;
		/**
		* Invalid frequency that is used as the default frontend frequency setting.

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

+2 −0

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

		package android.media.tv.tuner.filter;

		import android.annotation.IntRange;
		import android.annotation.SystemApi;

		/**
		@@ -51,6 +52,7 @@ public class DownloadEvent extends FilterEvent {
		/**
		* Gets MPU sequence number of filtered data.
		*/
		@IntRange(from = 0)
		public int getMpuSequenceNumber() {
		return mMpuSequenceNumber;
		}

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -309,7 +309,8 @@ public class Filter implements AutoCloseable {
		}

		/**
		* Gets the filter Id.
		* Gets the filter Id in 32-bit. For any Tuner SoC that supports 64-bit filter architecture,
		* use {@link #getIdLong()}.
		*/
		public int getId() {
		synchronized (mLock) {
		@@ -319,9 +320,10 @@ public class Filter implements AutoCloseable {
		}

		/**
		* Gets the 64-bit filter Id.
		* Gets the 64-bit filter Id. For any Tuner SoC that supports 32-bit filter architecture,
		* use {@link #getId()}.
		*/
		public long getId64Bit() {
		public long getIdLong() {
		synchronized (mLock) {
		TunerUtils.checkResourceState(TAG, mIsClosed);
		return nativeGetId64Bit();

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

+2 −0

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

		import android.annotation.BytesLong;
		import android.annotation.IntRange;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.media.MediaCodec.LinearBlock;
		@@ -154,6 +155,7 @@ public class MediaEvent extends FilterEvent {
		/**
		* Gets MPU sequence number of filtered data.
		*/
		@IntRange(from = 0)
		public int getMpuSequenceNumber() {
		return mMpuSequenceNumber;
		}