diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-05-08 14:40:49 -0700 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2015-05-08 15:31:15 -0700 |
| commit | c53ad69bcc920cdbdb15685ddad1d864631bb4f7 (patch) | |
| tree | 7f363371839b7f114f535f0c94d32b9f6cda26a5 /api | |
| parent | 3974fb239392099608f969254c4d86e7d13ab32d (diff) | |
| download | frameworks_base-c53ad69bcc920cdbdb15685ddad1d864631bb4f7.zip frameworks_base-c53ad69bcc920cdbdb15685ddad1d864631bb4f7.tar.gz frameworks_base-c53ad69bcc920cdbdb15685ddad1d864631bb4f7.tar.bz2 | |
media: merge CodecException's getErrorCode and getReason.
And unhide getErrorCode.
Bug: 20950388
Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
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 929da0e..af6e9fa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15414,11 +15414,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 f9fa4e3..5f48a8f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16636,11 +16636,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 { |