Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE" into sc-dev (1123c38b) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -5087,9 +5087,10 @@ package android.media {
		}

		public static class AudioTrack.TunerConfiguration {
		ctor @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public AudioTrack.TunerConfiguration(@IntRange(from=1) int, @IntRange(from=1) int);
		ctor @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public AudioTrack.TunerConfiguration(@IntRange(from=0) int, @IntRange(from=1) int);
		method @IntRange(from=1) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getContentId();
		method @IntRange(from=1) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getSyncId();
		field public static final int CONTENT_ID_NONE = 0; // 0x0
		}

		public class HwAudioSource {

media/java/android/media/AudioTrack.java

+14 −5

Original line number	Diff line number	Diff line
		@@ -928,13 +928,22 @@ public class AudioTrack extends PlayerBase
		private final int mContentId;
		private final int mSyncId;

		/**
		* A special content id for {@link #TunerConfiguration(int, int)}
		* indicating audio is delivered
		* from an {@code AudioTrack} write, not tunneled from the tuner stack.
		*/
		public static final int CONTENT_ID_NONE = 0;

		/**
		* Constructs a TunerConfiguration instance for use in {@link AudioTrack.Builder}
		*
		* @param contentId selects the audio stream to use.
		* The contentId may be obtained from
		* {@link android.media.tv.tuner.filter.Filter#getId()}.
		* This is always a positive number.
		* {@link android.media.tv.tuner.filter.Filter#getId()},
		* such obtained id is always a positive number.
		* If audio is to be delivered through an {@code AudioTrack} write
		* then {@code CONTENT_ID_NONE} may be used.
		* @param syncId selects the clock to use for synchronization
		* of audio with other streams such as video.
		* The syncId may be obtained from
		@@ -943,10 +952,10 @@ public class AudioTrack extends PlayerBase
		*/
		@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
		public TunerConfiguration(
		@IntRange(from = 1) int contentId, @IntRange(from = 1)int syncId) {
		if (contentId < 1) {
		@IntRange(from = 0) int contentId, @IntRange(from = 1)int syncId) {
		if (contentId < 0) {
		throw new IllegalArgumentException(
		"contentId " + contentId + " must be positive");
		"contentId " + contentId + " must be positive or CONTENT_ID_NONE");
		}
		if (syncId < 1) {
		throw new IllegalArgumentException("syncId " + syncId + " must be positive");