diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-05-08 22:53:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 22:53:33 +0000 |
| commit | 69e927c3cd8398e484849f7639fd781e106c1045 (patch) | |
| tree | 8a7871fd3d543ad444c2f41a82e983e46f375a4c /api | |
| parent | 61df07e1504bd1731d211f47ed9d40df7522d924 (diff) | |
| parent | c53ad69bcc920cdbdb15685ddad1d864631bb4f7 (diff) | |
| download | frameworks_base-69e927c3cd8398e484849f7639fd781e106c1045.zip frameworks_base-69e927c3cd8398e484849f7639fd781e106c1045.tar.gz frameworks_base-69e927c3cd8398e484849f7639fd781e106c1045.tar.bz2 | |
Merge "media: merge CodecException's getErrorCode and getReason." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rw-r--r-- | api/system-current.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 07137f1..cea5507 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15415,11 +15415,11 @@ package android.media { public static final class MediaCodec.CodecException extends java.lang.IllegalStateException { method public java.lang.String getDiagnosticInfo(); - method public int getReason(); + method public int getErrorCode(); method public boolean isRecoverable(); method public boolean isTransient(); - field public static final int REASON_HARDWARE = 0; // 0x0 - field public static final int REASON_RECLAIMED = 1; // 0x1 + field public static final int ERROR_INSUFFICIENT_RESOURCE = 1100; // 0x44c + field public static final int ERROR_RECLAIMED = 1101; // 0x44d } public static final class MediaCodec.CryptoException extends java.lang.RuntimeException { diff --git a/api/system-current.txt b/api/system-current.txt index 00da3d3..93e9446 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16637,11 +16637,11 @@ package android.media { public static final class MediaCodec.CodecException extends java.lang.IllegalStateException { method public java.lang.String getDiagnosticInfo(); - method public int getReason(); + method public int getErrorCode(); method public boolean isRecoverable(); method public boolean isTransient(); - field public static final int REASON_HARDWARE = 0; // 0x0 - field public static final int REASON_RECLAIMED = 1; // 0x1 + field public static final int ERROR_INSUFFICIENT_RESOURCE = 1100; // 0x44c + field public static final int ERROR_RECLAIMED = 1101; // 0x44d } public static final class MediaCodec.CryptoException extends java.lang.RuntimeException { |