diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-07 19:15:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-07 19:15:19 +0000 |
| commit | 76477a25faa7074ac3d56af92e705531d361563c (patch) | |
| tree | a8e6aae465848326d9ab4e16ea70047e3fe85c95 | |
| parent | e15db174623bccddc1064a967862223161d043c9 (diff) | |
| parent | 1efabd3f8962ff887b88ef9361888052f1265bec (diff) | |
| download | frameworks_base-76477a25faa7074ac3d56af92e705531d361563c.zip frameworks_base-76477a25faa7074ac3d56af92e705531d361563c.tar.gz frameworks_base-76477a25faa7074ac3d56af92e705531d361563c.tar.bz2 | |
Merge "media: add undocumented exceptions to MediaCodec api."
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index a7f33fa..fd7fca6 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -540,6 +540,8 @@ final public class MediaCodec { * or the flags are not set properly * (e.g. missing {@link #CONFIGURE_FLAG_ENCODE} for an encoder). * @throws IllegalStateException if not in the Initialized state. + * @throws CryptoException upon DRM error. + * @throws CodecException upon codec error. */ public void configure( MediaFormat format, |