Merge "MediaPlayer2: mark MediaPlayer-style DRM APIs TestApi" (b22db9be) · Commits · e / os / android_frameworks_base

api/test-current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -839,6 +839,17 @@ package android.media {
		method public android.media.BufferingParams.Builder setResumePlaybackMarkMs(int);
		}

		public class MediaPlayer2 implements android.media.AudioRouting java.lang.AutoCloseable {
		method public android.media.MediaPlayer2.DrmInfo getDrmInfo(@NonNull android.media.DataSourceDesc);
		method public android.media.MediaDrm.KeyRequest getDrmKeyRequest(@NonNull android.media.DataSourceDesc, @Nullable byte[], @Nullable byte[], @Nullable String, int, @Nullable java.util.Map<java.lang.String,java.lang.String>) throws android.media.MediaPlayer2.NoDrmSchemeException;
		method public String getDrmPropertyString(@NonNull android.media.DataSourceDesc, @NonNull String) throws android.media.MediaPlayer2.NoDrmSchemeException;
		method public Object prepareDrm(@NonNull android.media.DataSourceDesc, @NonNull java.util.UUID);
		method public byte[] provideDrmKeyResponse(@NonNull android.media.DataSourceDesc, @Nullable byte[], @NonNull byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer2.NoDrmSchemeException;
		method public void releaseDrm(@NonNull android.media.DataSourceDesc) throws android.media.MediaPlayer2.NoDrmSchemeException;
		method public void restoreDrmKeys(@NonNull android.media.DataSourceDesc, @NonNull byte[]) throws android.media.MediaPlayer2.NoDrmSchemeException;
		method public void setDrmPropertyString(@NonNull android.media.DataSourceDesc, @NonNull String, @NonNull String) throws android.media.MediaPlayer2.NoDrmSchemeException;
		}

		public final class PlaybackParams implements android.os.Parcelable {
		method public int getAudioStretchMode();
		method public android.media.PlaybackParams setAudioStretchMode(int);

media/apex/java/android/media/MediaPlayer2.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.StringDef;
		import android.annotation.TestApi;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.res.AssetFileDescriptor;
		@@ -3758,6 +3759,7 @@ public class MediaPlayer2 implements AutoCloseable
		* @throws IllegalStateException if called before being prepared
		* @hide
		*/
		@TestApi
		public DrmInfo getDrmInfo(@NonNull DataSourceDesc dsd) {
		final SourceInfo sourceInfo = getSourceInfo(dsd);
		if (sourceInfo != null) {
		@@ -3814,6 +3816,7 @@ public class MediaPlayer2 implements AutoCloseable
		* @hide
		*/
		// This is an asynchronous call.
		@TestApi
		public Object prepareDrm(@NonNull DataSourceDesc dsd, @NonNull UUID uuid) {
		return addTask(newPrepareDrmTask(dsd, uuid));
		}
		@@ -3905,6 +3908,7 @@ public class MediaPlayer2 implements AutoCloseable
		* @hide
		*/
		// This is a synchronous call.
		@TestApi
		public void releaseDrm(@NonNull DataSourceDesc dsd)
		throws NoDrmSchemeException {
		final SourceInfo sourceInfo = getSourceInfo(dsd);
		@@ -3955,6 +3959,7 @@ public class MediaPlayer2 implements AutoCloseable
		* @throws NoDrmSchemeException if there is no active DRM session
		* @hide
		*/
		@TestApi
		public MediaDrm.KeyRequest getDrmKeyRequest(
		@NonNull DataSourceDesc dsd,
		@Nullable byte[] keySetId, @Nullable byte[] initData,
		@@ -3997,6 +4002,7 @@ public class MediaPlayer2 implements AutoCloseable
		* @hide
		*/
		// This is a synchronous call.
		@TestApi
		public byte[] provideDrmKeyResponse(
		@NonNull DataSourceDesc dsd,
		@Nullable byte[] keySetId, @NonNull byte[] response)
		@@ -4023,6 +4029,7 @@ public class MediaPlayer2 implements AutoCloseable
		* @hide
		*/
		// This is a synchronous call.
		@TestApi
		public void restoreDrmKeys(
		@NonNull DataSourceDesc dsd,
		@NonNull byte[] keySetId)
		@@ -4050,6 +4057,7 @@ public class MediaPlayer2 implements AutoCloseable
		* @throws NoDrmSchemeException if there is no active DRM session
		* @hide
		*/
		@TestApi
		public String getDrmPropertyString(
		@NonNull DataSourceDesc dsd,
		@NonNull @MediaDrmStringProperty String propertyName)
		@@ -4078,6 +4086,7 @@ public class MediaPlayer2 implements AutoCloseable
		* @hide
		*/
		// This is a synchronous call.
		@TestApi
		public void setDrmPropertyString(
		@NonNull DataSourceDesc dsd,
		@NonNull @MediaDrmStringProperty String propertyName, @NonNull String value)