From c53ad69bcc920cdbdb15685ddad1d864631bb4f7 Mon Sep 17 00:00:00 2001 From: Ronghua Wu Date: Fri, 8 May 2015 14:40:49 -0700 Subject: media: merge CodecException's getErrorCode and getReason. And unhide getErrorCode. Bug: 20950388 Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f --- api/current.txt | 6 +++--- api/system-current.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'api') 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 { -- cgit v1.1