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

Commit 82cc1c5a authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Unhide secure stop APIs" into lmp-mr1-dev

parents b3898fbe 846e712d

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -14840,6 +14840,7 @@ package android.media { 
    method public byte[] getPropertyByteArray(java.lang.String);

    method public java.lang.String getPropertyString(java.lang.String);

    method public android.media.MediaDrm.ProvisionRequest getProvisionRequest();

    method public byte[] getSecureStop(byte[]);

    method public java.util.List<byte[]> getSecureStops();

    method public static final boolean isCryptoSchemeSupported(java.util.UUID);

    method public static final boolean isCryptoSchemeSupported(java.util.UUID, java.lang.String);
@@ -14848,6 +14849,7 @@ package android.media { 
    method public void provideProvisionResponse(byte[]) throws android.media.DeniedByServerException;

    method public java.util.HashMap<java.lang.String, java.lang.String> queryKeyStatus(byte[]);

    method public final void release();

    method public void releaseAllSecureStops();

    method public void releaseSecureStops(byte[]);

    method public void removeKeys(byte[]);

    method public void restoreKeys(byte[], byte[]);

media/java/android/media/MediaDrm.java

+0 −4
Original line number Diff line number Diff line
@@ -576,8 +576,6 @@ public final class MediaDrm { 
     * Access secure stop by secure stop ID.

     *

     * @param ssid - The secure stop ID provided by the license server.

     *

     * @hide - not part of the public API at this time

     */

    public native byte[] getSecureStop(byte[] ssid);
@@ -591,8 +589,6 @@ public final class MediaDrm { 


    /**

     * Remove all secure stops without requiring interaction with the server.

     *

     * @hide - not part of the public API at this time

     */

     public native void releaseAllSecureStops();