diff options
author | Elliott Hughes <enh@google.com> | 2013-07-01 10:07:44 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-01 10:07:44 -0700 |
commit | 2c25801e7e818ff949a46e54d82539bf96c8ecae (patch) | |
tree | fb3f82160d12fd97684a0808dff314cb4b17bb6e | |
parent | 05af0c28925d0d1b78687942ce1321b48d231032 (diff) | |
parent | cd4e51672087d3accc5eb0b6effa22f8d88d3acf (diff) | |
download | android_packages_apps_Tag-2c25801e7e818ff949a46e54d82539bf96c8ecae.tar.gz android_packages_apps_Tag-2c25801e7e818ff949a46e54d82539bf96c8ecae.tar.bz2 android_packages_apps_Tag-2c25801e7e818ff949a46e54d82539bf96c8ecae.zip |
am cd4e5167: am 5edf43bd: Merge "Switch Tag over to the public StandardCharsets."
* commit 'cd4e51672087d3accc5eb0b6effa22f8d88d3acf':
Switch Tag over to the public StandardCharsets.
-rw-r--r-- | canon/src/com/android/apps/tagcanon/TagCanon.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/canon/src/com/android/apps/tagcanon/TagCanon.java b/canon/src/com/android/apps/tagcanon/TagCanon.java index 8664cb1..1b772c9 100644 --- a/canon/src/com/android/apps/tagcanon/TagCanon.java +++ b/canon/src/com/android/apps/tagcanon/TagCanon.java @@ -37,7 +37,7 @@ import android.widget.ListView; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.Charset; -import java.nio.charset.Charsets; +import java.nio.charset.StandardCharsets; import java.util.Locale; /** @@ -53,9 +53,9 @@ public class TagCanon extends ListActivity { Preconditions.checkNotNull(text); Preconditions.checkNotNull(locale); - byte[] langBytes = locale.getLanguage().getBytes(Charsets.US_ASCII); + byte[] langBytes = locale.getLanguage().getBytes(StandardCharsets.US_ASCII); - Charset utfEncoding = encodeInUtf8 ? Charsets.UTF_8 : Charset.forName("UTF-16"); + Charset utfEncoding = encodeInUtf8 ? StandardCharsets.UTF_8 : StandardCharsets.UTF_16; byte[] textBytes = text.getBytes(utfEncoding); int utfBit = encodeInUtf8 ? 0 : (1 << 7); @@ -74,7 +74,7 @@ public class TagCanon extends ListActivity { Preconditions.checkNotNull(type); Preconditions.checkNotNull(data); - byte[] typeBytes = type.getBytes(Charsets.US_ASCII); + byte[] typeBytes = type.getBytes(StandardCharsets.US_ASCII); return new NdefRecord(NdefRecord.TNF_MIME_MEDIA, typeBytes, new byte[0], data); } |