summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2015-03-13 16:10:45 -0700
committerJeff Tinker <jtinker@google.com>2015-03-13 16:10:45 -0700
commit5ce85b99b3461b9bea40410f0539640476274b4f (patch)
treef4d9b7e679b9ef6ba13d5dac4f182828b2b1cfb5 /media
parent7c8d999f4228101075dad97950e4be2cbe7aa6ab (diff)
downloadframeworks_base-5ce85b99b3461b9bea40410f0539640476274b4f.zip
frameworks_base-5ce85b99b3461b9bea40410f0539640476274b4f.tar.gz
frameworks_base-5ce85b99b3461b9bea40410f0539640476274b4f.tar.bz2
Note in docs that MediaDrm methods throw IllegalStateException
Also fixes incorrect documention where ResourceBusyException can't be thrown bug: 18285793 Change-Id: I52d782a772aed97d32e70d7505c48540a320ca07
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaDrm.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index 6b37a34..060a65a 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -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
@@ -460,7 +464,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;