diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-28 16:26:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-28 16:26:08 -0700 |
| commit | d1411efee372a37fcd0178f3ccffd9bf1d67b70b (patch) | |
| tree | df4d577ea602cdb3055f101482f4ade1fb1ff11c /api | |
| parent | 5d2d22221a61258ff7dad29792bbf1201c746e8d (diff) | |
| parent | 324993abed48843da1cb63063668147151e4db5c (diff) | |
| download | frameworks_base-d1411efee372a37fcd0178f3ccffd9bf1d67b70b.zip frameworks_base-d1411efee372a37fcd0178f3ccffd9bf1d67b70b.tar.gz frameworks_base-d1411efee372a37fcd0178f3ccffd9bf1d67b70b.tar.bz2 | |
am 324993ab: am 5216f11e: Merge "Track libcore API update."
* commit '324993abed48843da1cb63063668147151e4db5c':
Track libcore API update.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 93e2b73..a9d4359 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35956,6 +35956,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(); |