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

Commit 3b6ec30b authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Fix exception discrepancy in MediaDrm.openSession 

bug: 13792521
Change-Id: I2e47ce754c1e560315bf2bf1144d94e01472e392
parent 0479c3b2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14467,7 +14467,7 @@ package android.media { 
    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);

    method public byte[] openSession() throws android.media.NotProvisionedException;

    method public byte[] openSession() throws android.media.NotProvisionedException, android.media.ResourceBusyException;

    method public byte[] provideKeyResponse(byte[], byte[]) throws android.media.DeniedByServerException, android.media.NotProvisionedException;

    method public void provideProvisionResponse(byte[]) throws android.media.DeniedByServerException;

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

media/java/android/media/MediaDrm.java

+2 −1
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ public final class MediaDrm { 
     * @throws NotProvisionedException if provisioning is needed

     * @throws ResourceBusyException if required resources are in use

     */

    public native byte[] openSession() throws NotProvisionedException;

    public native byte[] openSession() throws NotProvisionedException,

            ResourceBusyException;



    /**

     * Close a session on the MediaDrm object that was previously opened