Merge "MediaPlayer2: unhide prepare DRM error codes" (65dc480a) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -25589,6 +25589,14 @@ package android.media {
		field public static final int PLAYER_STATE_PAUSED = 1003; // 0x3eb
		field public static final int PLAYER_STATE_PLAYING = 1004; // 0x3ec
		field public static final int PLAYER_STATE_PREPARED = 1002; // 0x3ea
		field public static final int PREPARE_DRM_STATUS_KEY_EXCHANGE_ERROR = 7; // 0x7
		field public static final int PREPARE_DRM_STATUS_PREPARATION_ERROR = 3; // 0x3
		field public static final int PREPARE_DRM_STATUS_PROVISIONING_NETWORK_ERROR = 1; // 0x1
		field public static final int PREPARE_DRM_STATUS_PROVISIONING_SERVER_ERROR = 2; // 0x2
		field public static final int PREPARE_DRM_STATUS_RESOURCE_BUSY = 5; // 0x5
		field public static final int PREPARE_DRM_STATUS_RESTORE_ERROR = 6; // 0x6
		field public static final int PREPARE_DRM_STATUS_SUCCESS = 0; // 0x0
		field public static final int PREPARE_DRM_STATUS_UNSUPPORTED_SCHEME = 4; // 0x4
		field public static final int SEEK_CLOSEST = 3; // 0x3
		field public static final int SEEK_CLOSEST_SYNC = 2; // 0x2
		field public static final int SEEK_NEXT_SYNC = 1; // 0x1

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

+22 −9

Original line number	Diff line number	Diff line
		@@ -3668,53 +3668,66 @@ public class MediaPlayer2 implements AutoCloseable
		}

		/**
		* The status codes for {@link DrmEventCallback#onDrmPrepared} listener.
		* A status code for {@link DrmEventCallback#onDrmPrepared} listener.
		* <p>
		*
		* DRM preparation has succeeded.
		* @hide
		*/
		public static final int PREPARE_DRM_STATUS_SUCCESS = 0;

		/**
		* A status code for {@link DrmEventCallback#onDrmPrepared} listener.
		* <p>
		*
		* The device required DRM provisioning but couldn't reach the provisioning server.
		* @hide
		*/
		public static final int PREPARE_DRM_STATUS_PROVISIONING_NETWORK_ERROR = 1;

		/**
		* A status code for {@link DrmEventCallback#onDrmPrepared} listener.
		* <p>
		*
		* The device required DRM provisioning but the provisioning server denied the request.
		* @hide
		*/
		public static final int PREPARE_DRM_STATUS_PROVISIONING_SERVER_ERROR = 2;

		/**
		* A status code for {@link DrmEventCallback#onDrmPrepared} listener.
		* <p>
		*
		* The DRM preparation has failed .
		* @hide
		*/
		public static final int PREPARE_DRM_STATUS_PREPARATION_ERROR = 3;

		/**
		* A status code for {@link DrmEventCallback#onDrmPrepared} listener.
		* <p>
		*
		* The crypto scheme UUID is not supported by the device.
		* @hide
		*/
		public static final int PREPARE_DRM_STATUS_UNSUPPORTED_SCHEME = 4;

		/**
		* A status code for {@link DrmEventCallback#onDrmPrepared} listener.
		* <p>
		*
		* The hardware resources are not available, due to being in use.
		* @hide
		*/
		public static final int PREPARE_DRM_STATUS_RESOURCE_BUSY = 5;

		/**
		* A status code for {@link DrmEventCallback#onDrmPrepared} listener.
		* <p>
		*
		* Restoring persisted offline keys failed.
		* @hide
		*/
		public static final int PREPARE_DRM_STATUS_RESTORE_ERROR = 6;

		/**
		* A status code for {@link DrmEventCallback#onDrmPrepared} listener.
		* <p>
		*
		* Error during key request/response exchange with license server.
		* @hide
		*/
		public static final int PREPARE_DRM_STATUS_KEY_EXCHANGE_ERROR = 7;