diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:07 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:07 -0800 |
| commit | d94c06c605baa7814b787bab7c993775b486ffba (patch) | |
| tree | a2b36c743db7cb9fd4d6ac4cc89fdfb53ed2e35e /icu/src/main/java/com | |
| parent | a0881d052ee72e3f7e773374e9b1aa75fbd6be4c (diff) | |
| download | libcore-d94c06c605baa7814b787bab7c993775b486ffba.zip libcore-d94c06c605baa7814b787bab7c993775b486ffba.tar.gz libcore-d94c06c605baa7814b787bab7c993775b486ffba.tar.bz2 | |
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'icu/src/main/java/com')
| -rw-r--r-- | icu/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java b/icu/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java index e33e1b2..3b9bf86 100644 --- a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java +++ b/icu/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java @@ -17,7 +17,7 @@ package com.ibm.icu4jni.charset; import com.ibm.icu4jni.common.ErrorCode; // BEGIN android-removed // import com.ibm.icu4jni.converters.NativeConverter; -// ENd android-removed +// END android-removed import java.nio.CharBuffer; @@ -253,9 +253,9 @@ public final class CharsetDecoderICU extends CharsetDecoder{ if(ec == ErrorCode.U_BUFFER_OVERFLOW_ERROR){ return CoderResult.OVERFLOW; }else if(ec==ErrorCode.U_INVALID_CHAR_FOUND){ - return CoderResult.unmappableForLength(data[INVALID_BYTES]); + return CoderResult.malformedForLength(data[INVALID_BYTES]); }else if(ec==ErrorCode.U_ILLEGAL_CHAR_FOUND){ - return CoderResult.unmappableForLength(data[INVALID_BYTES]); + return CoderResult.malformedForLength(data[INVALID_BYTES]); } /* decoding action succeded */ return CoderResult.UNDERFLOW; |