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

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

Merge "Note in docs that MediaDrm methods throw IllegalStateException"

parents 8873f848 5ce85b99
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ import android.util.Log;
 * encrypted content, the samples returned from the extractor remain encrypted, they
 * are only decrypted when the samples are delivered to the decoder.
 * <p>
 * MediaDrm methods throw {@link java.lang.IllegalStateException}
 * when a method is called on a MediaDrm object that is in an invalid or inoperable
 * state. This is typically due to incorrect application API usage, but may also
 * be due to an unrecoverable failure in the DRM plugin or security hardware.
 * <a name="Callbacks"></a>
 * <h3>Callbacks</h3>
 * <p>Applications should register for informational events in order
@@ -481,7 +485,6 @@ public final class MediaDrm {
     * reprovisioning is required
     * @throws DeniedByServerException if the response indicates that the
     * server rejected the request
     * @throws ResourceBusyException if required resources are in use
     */
    public native byte[] provideKeyResponse(byte[] scope, byte[] response)
            throws NotProvisionedException, DeniedByServerException;