diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-07-07 21:19:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 21:19:13 +0000 |
| commit | 6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5 (patch) | |
| tree | f9cc341092643b53bcdadc5e79ade7ba5b534e77 /media/java | |
| parent | 8830db0a6a595f1690cb6f0b76863c3759a8ccbd (diff) | |
| parent | 96a2a957e42e04be817b60bb27199f3846f00fc9 (diff) | |
| download | frameworks_base-6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5.zip frameworks_base-6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5.tar.gz frameworks_base-6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5.tar.bz2 | |
Merge "Report specific exception type on decrypt with invalid session" into mnc-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index a79dd04..5f60891 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -2029,12 +2029,21 @@ final public class MediaCodec { */ public static final int ERROR_INSUFFICIENT_OUTPUT_PROTECTION = 4; + /** + * This indicates that decryption was attempted on a session that is + * not opened, which could be due to a failure to open the session, + * closing the session prematurely, or the session being reclaimed + * by the resource manager. + */ + public static final int ERROR_SESSION_NOT_OPENED = 5; + /** @hide */ @IntDef({ ERROR_NO_KEY, ERROR_KEY_EXPIRED, ERROR_RESOURCE_BUSY, ERROR_INSUFFICIENT_OUTPUT_PROTECTION, + ERROR_SESSION_NOT_OPENED, }) @Retention(RetentionPolicy.SOURCE) public @interface CryptoErrorCode {} |