Merge "MediaPlayer/ModularDrm API review" into oc-dev (62a5d29f) · Commits · e / os / android_frameworks_base

api/current.txt

+15 −8

Original line number	Diff line number	Diff line
		@@ -22774,7 +22774,7 @@ package android.media {
		method public android.media.MediaPlayer.DrmInfo getDrmInfo();
		method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public int getDuration();
		method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public android.os.PersistableBundle getMetrics();
		method public android.media.PlaybackParams getPlaybackParams();
		method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
		@@ -22788,7 +22788,7 @@ package android.media {
		method public void pause() throws java.lang.IllegalStateException;
		method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;
		method public void prepareAsync() throws java.lang.IllegalStateException;
		method public void prepareDrm(java.util.UUID) throws android.media.MediaPlayer.ProvisioningErrorException, android.media.ResourceBusyException, android.media.UnsupportedSchemeException;
		method public void prepareDrm(java.util.UUID) throws android.media.MediaPlayer.ProvisioningNetworkErrorException, android.media.MediaPlayer.ProvisioningServerErrorException, android.media.ResourceBusyException, android.media.UnsupportedSchemeException;
		method public byte[] provideKeyResponse(byte[], byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer.NoDrmSchemeException;
		method public void release();
		method public void releaseDrm() throws android.media.MediaPlayer.NoDrmSchemeException;
		@@ -22815,7 +22815,7 @@ package android.media {
		method public void setNextMediaPlayer(android.media.MediaPlayer);
		method public void setOnBufferingUpdateListener(android.media.MediaPlayer.OnBufferingUpdateListener);
		method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener);
		method public void setOnDrmConfigListener(android.media.MediaPlayer.OnDrmConfigListener);
		method public void setOnDrmConfigHelper(android.media.MediaPlayer.OnDrmConfigHelper);
		method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener);
		method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener, android.os.Handler);
		method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener);
		@@ -22856,6 +22856,10 @@ package android.media {
		field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3
		field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc
		field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";
		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_SUCCESS = 0; // 0x0
		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
		@@ -22865,7 +22869,6 @@ package android.media {
		}

		public static final class MediaPlayer.DrmInfo {
		method public java.lang.String[] getMimes();
		method public java.util.Map<java.util.UUID, byte[]> getPssh();
		method public java.util.UUID[] getSupportedSchemes();
		}
		@@ -22897,7 +22900,7 @@ package android.media {
		method public abstract void onCompletion(android.media.MediaPlayer);
		}

		public static abstract interface MediaPlayer.OnDrmConfigListener {
		public static abstract interface MediaPlayer.OnDrmConfigHelper {
		method public abstract void onDrmConfig(android.media.MediaPlayer);
		}

		@@ -22906,7 +22909,7 @@ package android.media {
		}

		public static abstract interface MediaPlayer.OnDrmPreparedListener {
		method public abstract void onDrmPrepared(android.media.MediaPlayer, boolean);
		method public abstract void onDrmPrepared(android.media.MediaPlayer, int);
		}

		public static abstract interface MediaPlayer.OnErrorListener {
		@@ -22937,8 +22940,12 @@ package android.media {
		method public abstract void onVideoSizeChanged(android.media.MediaPlayer, int, int);
		}

		public static final class MediaPlayer.ProvisioningErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningErrorException(java.lang.String);
		public static final class MediaPlayer.ProvisioningNetworkErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningNetworkErrorException(java.lang.String);
		}

		public static final class MediaPlayer.ProvisioningServerErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningServerErrorException(java.lang.String);
		}

		public static class MediaPlayer.TrackInfo implements android.os.Parcelable {

api/system-current.txt

+15 −8

Original line number	Diff line number	Diff line
		@@ -24610,7 +24610,7 @@ package android.media {
		method public android.media.MediaPlayer.DrmInfo getDrmInfo();
		method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public int getDuration();
		method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public android.os.PersistableBundle getMetrics();
		method public android.media.PlaybackParams getPlaybackParams();
		method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
		@@ -24624,7 +24624,7 @@ package android.media {
		method public void pause() throws java.lang.IllegalStateException;
		method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;
		method public void prepareAsync() throws java.lang.IllegalStateException;
		method public void prepareDrm(java.util.UUID) throws android.media.MediaPlayer.ProvisioningErrorException, android.media.ResourceBusyException, android.media.UnsupportedSchemeException;
		method public void prepareDrm(java.util.UUID) throws android.media.MediaPlayer.ProvisioningNetworkErrorException, android.media.MediaPlayer.ProvisioningServerErrorException, android.media.ResourceBusyException, android.media.UnsupportedSchemeException;
		method public byte[] provideKeyResponse(byte[], byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer.NoDrmSchemeException;
		method public void release();
		method public void releaseDrm() throws android.media.MediaPlayer.NoDrmSchemeException;
		@@ -24651,7 +24651,7 @@ package android.media {
		method public void setNextMediaPlayer(android.media.MediaPlayer);
		method public void setOnBufferingUpdateListener(android.media.MediaPlayer.OnBufferingUpdateListener);
		method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener);
		method public void setOnDrmConfigListener(android.media.MediaPlayer.OnDrmConfigListener);
		method public void setOnDrmConfigHelper(android.media.MediaPlayer.OnDrmConfigHelper);
		method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener);
		method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener, android.os.Handler);
		method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener);
		@@ -24692,6 +24692,10 @@ package android.media {
		field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3
		field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc
		field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";
		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_SUCCESS = 0; // 0x0
		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
		@@ -24701,7 +24705,6 @@ package android.media {
		}

		public static final class MediaPlayer.DrmInfo {
		method public java.lang.String[] getMimes();
		method public java.util.Map<java.util.UUID, byte[]> getPssh();
		method public java.util.UUID[] getSupportedSchemes();
		}
		@@ -24733,7 +24736,7 @@ package android.media {
		method public abstract void onCompletion(android.media.MediaPlayer);
		}

		public static abstract interface MediaPlayer.OnDrmConfigListener {
		public static abstract interface MediaPlayer.OnDrmConfigHelper {
		method public abstract void onDrmConfig(android.media.MediaPlayer);
		}

		@@ -24742,7 +24745,7 @@ package android.media {
		}

		public static abstract interface MediaPlayer.OnDrmPreparedListener {
		method public abstract void onDrmPrepared(android.media.MediaPlayer, boolean);
		method public abstract void onDrmPrepared(android.media.MediaPlayer, int);
		}

		public static abstract interface MediaPlayer.OnErrorListener {
		@@ -24773,8 +24776,12 @@ package android.media {
		method public abstract void onVideoSizeChanged(android.media.MediaPlayer, int, int);
		}

		public static final class MediaPlayer.ProvisioningErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningErrorException(java.lang.String);
		public static final class MediaPlayer.ProvisioningNetworkErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningNetworkErrorException(java.lang.String);
		}

		public static final class MediaPlayer.ProvisioningServerErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningServerErrorException(java.lang.String);
		}

		public static class MediaPlayer.TrackInfo implements android.os.Parcelable {

api/test-current.txt

+15 −8

Original line number	Diff line number	Diff line
		@@ -22881,7 +22881,7 @@ package android.media {
		method public android.media.MediaPlayer.DrmInfo getDrmInfo();
		method public java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public int getDuration();
		method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public android.media.MediaDrm.KeyRequest getKeyRequest(byte[], byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer.NoDrmSchemeException;
		method public android.os.PersistableBundle getMetrics();
		method public android.media.PlaybackParams getPlaybackParams();
		method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
		@@ -22895,7 +22895,7 @@ package android.media {
		method public void pause() throws java.lang.IllegalStateException;
		method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;
		method public void prepareAsync() throws java.lang.IllegalStateException;
		method public void prepareDrm(java.util.UUID) throws android.media.MediaPlayer.ProvisioningErrorException, android.media.ResourceBusyException, android.media.UnsupportedSchemeException;
		method public void prepareDrm(java.util.UUID) throws android.media.MediaPlayer.ProvisioningNetworkErrorException, android.media.MediaPlayer.ProvisioningServerErrorException, android.media.ResourceBusyException, android.media.UnsupportedSchemeException;
		method public byte[] provideKeyResponse(byte[], byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer.NoDrmSchemeException;
		method public void release();
		method public void releaseDrm() throws android.media.MediaPlayer.NoDrmSchemeException;
		@@ -22922,7 +22922,7 @@ package android.media {
		method public void setNextMediaPlayer(android.media.MediaPlayer);
		method public void setOnBufferingUpdateListener(android.media.MediaPlayer.OnBufferingUpdateListener);
		method public void setOnCompletionListener(android.media.MediaPlayer.OnCompletionListener);
		method public void setOnDrmConfigListener(android.media.MediaPlayer.OnDrmConfigListener);
		method public void setOnDrmConfigHelper(android.media.MediaPlayer.OnDrmConfigHelper);
		method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener);
		method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener, android.os.Handler);
		method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener);
		@@ -22963,6 +22963,10 @@ package android.media {
		field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3
		field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc
		field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";
		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_SUCCESS = 0; // 0x0
		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
		@@ -22972,7 +22976,6 @@ package android.media {
		}

		public static final class MediaPlayer.DrmInfo {
		method public java.lang.String[] getMimes();
		method public java.util.Map<java.util.UUID, byte[]> getPssh();
		method public java.util.UUID[] getSupportedSchemes();
		}
		@@ -23004,7 +23007,7 @@ package android.media {
		method public abstract void onCompletion(android.media.MediaPlayer);
		}

		public static abstract interface MediaPlayer.OnDrmConfigListener {
		public static abstract interface MediaPlayer.OnDrmConfigHelper {
		method public abstract void onDrmConfig(android.media.MediaPlayer);
		}

		@@ -23013,7 +23016,7 @@ package android.media {
		}

		public static abstract interface MediaPlayer.OnDrmPreparedListener {
		method public abstract void onDrmPrepared(android.media.MediaPlayer, boolean);
		method public abstract void onDrmPrepared(android.media.MediaPlayer, int);
		}

		public static abstract interface MediaPlayer.OnErrorListener {
		@@ -23044,8 +23047,12 @@ package android.media {
		method public abstract void onVideoSizeChanged(android.media.MediaPlayer, int, int);
		}

		public static final class MediaPlayer.ProvisioningErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningErrorException(java.lang.String);
		public static final class MediaPlayer.ProvisioningNetworkErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningNetworkErrorException(java.lang.String);
		}

		public static final class MediaPlayer.ProvisioningServerErrorException extends android.media.MediaDrmException {
		ctor public MediaPlayer.ProvisioningServerErrorException(java.lang.String);
		}

		public static class MediaPlayer.TrackInfo implements android.os.Parcelable {

media/java/android/media/MediaPlayer.java

+213 −140

File changed.

Preview size limit exceeded, changes collapsed.