summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-28 23:17:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-06-28 23:17:20 +0000
commit5216f11e462b9f17704c0ac9e193d2149f3fa755 (patch)
treeff73badf3ba97fafd763d430e3b56d892966143b
parentee66531f2fa2b6aaa5ca064062f5e8d50b64ff44 (diff)
parent0e88a9548078da56a1d434425916a2074e6f5aa1 (diff)
downloadbase-5216f11e462b9f17704c0ac9e193d2149f3fa755.tar.gz
Merge "Track libcore API update."
-rw-r--r--api/current.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 3f81c046ba6b..54edf6475cab 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34849,6 +34849,15 @@ package java.nio.charset {
method public int getInputLength();
}
+ public final class StandardCharsets {
+ field public static final java.nio.charset.Charset ISO_8859_1;
+ field public static final java.nio.charset.Charset US_ASCII;
+ field public static final java.nio.charset.Charset UTF_16;
+ field public static final java.nio.charset.Charset UTF_16BE;
+ field public static final java.nio.charset.Charset UTF_16LE;
+ field public static final java.nio.charset.Charset UTF_8;
+ }
+
public class UnmappableCharacterException extends java.nio.charset.CharacterCodingException {
ctor public UnmappableCharacterException(int);
method public int getInputLength();