Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b52e95c authored by Hassan Shojania's avatar Hassan Shojania
Browse files

Modular DRM for MediaPlayer 

Bug:  34559906
Test: Manual through the test app

Change-Id: If76e2898e6064c5661193872b907b1720838c678
parent 3be1f6fd

api/current.txt

+39 −0
Original line number Diff line number Diff line
@@ -22145,7 +22145,10 @@ package android.media { 
    method public android.media.BufferingParams getBufferingParams();

    method public int getCurrentPosition();

    method public android.media.BufferingParams getDefaultBufferingParams();

    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.os.Bundle getMetrics();

    method public android.media.PlaybackParams getPlaybackParams();

    method public int getSelectedTrack(int) throws java.lang.IllegalStateException;
@@ -22159,8 +22162,12 @@ 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, android.media.MediaPlayer.OnDrmConfigCallback) throws android.media.MediaPlayer.ProvisioningErrorException, 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;

    method public void reset();

    method public void restoreKeys(byte[]) throws android.media.MediaPlayer.NoDrmSchemeException;

    method public void seekTo(int, int) throws java.lang.IllegalStateException;

    method public void seekTo(int) throws java.lang.IllegalStateException;

    method public void selectTrack(int) throws java.lang.IllegalStateException;
@@ -22177,10 +22184,15 @@ package android.media { 
    method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setDataSource(android.media.MediaDataSource) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setDisplay(android.view.SurfaceHolder);

    method public void setDrmPropertyString(java.lang.String, java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;

    method public void setLooping(boolean);

    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 setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener);

    method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener, android.os.Handler);

    method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener);

    method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener, android.os.Handler);

    method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener);

    method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener);

    method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener);
@@ -22223,6 +22235,16 @@ package android.media { 
    field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2

  }













  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();













  }

























  public static final class MediaPlayer.NoDrmSchemeException extends android.media.MediaDrmException {













    ctor public MediaPlayer.NoDrmSchemeException(java.lang.String);













  }



























  public static abstract interface MediaPlayer.OnBufferingUpdateListener {















    method public abstract void onBufferingUpdate(android.media.MediaPlayer, int);















  }









@@ -22231,6 +22253,19 @@ package android.media {













    method public abstract void onCompletion(android.media.MediaPlayer);















  }



























  public static abstract class MediaPlayer.OnDrmConfigCallback {













    ctor public MediaPlayer.OnDrmConfigCallback();













    method public void onDrmConfig(android.media.MediaPlayer);













  }

























  public static abstract interface MediaPlayer.OnDrmInfoListener {













    method public abstract void onDrmInfo(android.media.MediaPlayer, android.media.MediaPlayer.DrmInfo);













  }

























  public static abstract interface MediaPlayer.OnDrmPreparedListener {













    method public abstract void onDrmPrepared(android.media.MediaPlayer, boolean);













  }



























  public static abstract interface MediaPlayer.OnErrorListener {















    method public abstract boolean onError(android.media.MediaPlayer, int, int);















  }










@@ -22259,6 +22294,10 @@ 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 class MediaPlayer.TrackInfo implements android.os.Parcelable {















    method public int describeContents();















    method public android.media.MediaFormat getFormat();

























api/system-current.txt



+39
−0




























Original line number
Diff line number
Diff line








@@ -23749,7 +23749,10 @@ package android.media {













    method public android.media.BufferingParams getBufferingParams();















    method public int getCurrentPosition();















    method public android.media.BufferingParams getDefaultBufferingParams();













    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.os.Bundle getMetrics();















    method public android.media.PlaybackParams getPlaybackParams();















    method public int getSelectedTrack(int) throws java.lang.IllegalStateException;









@@ -23763,8 +23766,12 @@ 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, android.media.MediaPlayer.OnDrmConfigCallback) throws android.media.MediaPlayer.ProvisioningErrorException, 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;















    method public void reset();













    method public void restoreKeys(byte[]) throws android.media.MediaPlayer.NoDrmSchemeException;















    method public void seekTo(int, int) throws java.lang.IllegalStateException;















    method public void seekTo(int) throws java.lang.IllegalStateException;















    method public void selectTrack(int) throws java.lang.IllegalStateException;









@@ -23781,10 +23788,15 @@ package android.media {













    method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;















    method public void setDataSource(android.media.MediaDataSource) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;















    method public void setDisplay(android.view.SurfaceHolder);













    method public void setDrmPropertyString(java.lang.String, java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;















    method public void setLooping(boolean);















    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 setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener);













    method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener, android.os.Handler);













    method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener);













    method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener, android.os.Handler);















    method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener);















    method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener);















    method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener);










@@ -23827,6 +23839,16 @@ package android.media {













    field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2















  }



























  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();













  }

























  public static final class MediaPlayer.NoDrmSchemeException extends android.media.MediaDrmException {













    ctor public MediaPlayer.NoDrmSchemeException(java.lang.String);













  }



























  public static abstract interface MediaPlayer.OnBufferingUpdateListener {















    method public abstract void onBufferingUpdate(android.media.MediaPlayer, int);















  }









@@ -23835,6 +23857,19 @@ package android.media {













    method public abstract void onCompletion(android.media.MediaPlayer);















  }



























  public static abstract class MediaPlayer.OnDrmConfigCallback {













    ctor public MediaPlayer.OnDrmConfigCallback();













    method public void onDrmConfig(android.media.MediaPlayer);













  }

























  public static abstract interface MediaPlayer.OnDrmInfoListener {













    method public abstract void onDrmInfo(android.media.MediaPlayer, android.media.MediaPlayer.DrmInfo);













  }

























  public static abstract interface MediaPlayer.OnDrmPreparedListener {













    method public abstract void onDrmPrepared(android.media.MediaPlayer, boolean);













  }



























  public static abstract interface MediaPlayer.OnErrorListener {















    method public abstract boolean onError(android.media.MediaPlayer, int, int);















  }










@@ -23863,6 +23898,10 @@ 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 class MediaPlayer.TrackInfo implements android.os.Parcelable {















    method public int describeContents();















    method public android.media.MediaFormat getFormat();

























api/test-current.txt



+39
−0




























Original line number
Diff line number
Diff line








@@ -22237,7 +22237,10 @@ package android.media {













    method public android.media.BufferingParams getBufferingParams();















    method public int getCurrentPosition();















    method public android.media.BufferingParams getDefaultBufferingParams();













    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.os.Bundle getMetrics();















    method public android.media.PlaybackParams getPlaybackParams();















    method public int getSelectedTrack(int) throws java.lang.IllegalStateException;









@@ -22251,8 +22254,12 @@ 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, android.media.MediaPlayer.OnDrmConfigCallback) throws android.media.MediaPlayer.ProvisioningErrorException, 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;















    method public void reset();













    method public void restoreKeys(byte[]) throws android.media.MediaPlayer.NoDrmSchemeException;















    method public void seekTo(int, int) throws java.lang.IllegalStateException;















    method public void seekTo(int) throws java.lang.IllegalStateException;















    method public void selectTrack(int) throws java.lang.IllegalStateException;









@@ -22269,10 +22276,15 @@ package android.media {













    method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;















    method public void setDataSource(android.media.MediaDataSource) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;















    method public void setDisplay(android.view.SurfaceHolder);













    method public void setDrmPropertyString(java.lang.String, java.lang.String) throws android.media.MediaPlayer.NoDrmSchemeException;















    method public void setLooping(boolean);















    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 setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener);













    method public void setOnDrmInfoListener(android.media.MediaPlayer.OnDrmInfoListener, android.os.Handler);













    method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener);













    method public void setOnDrmPreparedListener(android.media.MediaPlayer.OnDrmPreparedListener, android.os.Handler);















    method public void setOnErrorListener(android.media.MediaPlayer.OnErrorListener);















    method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener);















    method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener);










@@ -22315,6 +22327,16 @@ package android.media {













    field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2















  }



























  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();













  }

























  public static final class MediaPlayer.NoDrmSchemeException extends android.media.MediaDrmException {













    ctor public MediaPlayer.NoDrmSchemeException(java.lang.String);













  }



























  public static abstract interface MediaPlayer.OnBufferingUpdateListener {















    method public abstract void onBufferingUpdate(android.media.MediaPlayer, int);















  }









@@ -22323,6 +22345,19 @@ package android.media {













    method public abstract void onCompletion(android.media.MediaPlayer);















  }



























  public static abstract class MediaPlayer.OnDrmConfigCallback {













    ctor public MediaPlayer.OnDrmConfigCallback();













    method public void onDrmConfig(android.media.MediaPlayer);













  }

























  public static abstract interface MediaPlayer.OnDrmInfoListener {













    method public abstract void onDrmInfo(android.media.MediaPlayer, android.media.MediaPlayer.DrmInfo);













  }

























  public static abstract interface MediaPlayer.OnDrmPreparedListener {













    method public abstract void onDrmPrepared(android.media.MediaPlayer, boolean);













  }



























  public static abstract interface MediaPlayer.OnErrorListener {















    method public abstract boolean onError(android.media.MediaPlayer, int, int);















  }










@@ -22351,6 +22386,10 @@ 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 class MediaPlayer.TrackInfo implements android.os.Parcelable {















    method public int describeContents();















    method public android.media.MediaFormat getFormat();

























media/java/android/media/MediaPlayer.java



+1044
−1


























File changed.
Preview size limit exceeded, changes collapsed.
























media/jni/android_media_MediaPlayer.cpp



+577
−0


























File changed.
Preview size limit exceeded, changes collapsed.