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 /api | |
| 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 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 9ead86d..2905e17 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15401,6 +15401,7 @@ package android.media { field public static final int ERROR_KEY_EXPIRED = 2; // 0x2 field public static final int ERROR_NO_KEY = 1; // 0x1 field public static final int ERROR_RESOURCE_BUSY = 3; // 0x3 + field public static final int ERROR_SESSION_NOT_OPENED = 5; // 0x5 } public static final class MediaCodec.CryptoInfo { diff --git a/api/system-current.txt b/api/system-current.txt index af8a1b8..150b569 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16664,6 +16664,7 @@ package android.media { field public static final int ERROR_KEY_EXPIRED = 2; // 0x2 field public static final int ERROR_NO_KEY = 1; // 0x1 field public static final int ERROR_RESOURCE_BUSY = 3; // 0x3 + field public static final int ERROR_SESSION_NOT_OPENED = 5; // 0x5 } public static final class MediaCodec.CryptoInfo { |