diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-28 16:24:48 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-06-28 16:24:48 -0700 |
| commit | d396a448b2e36e29598c954b64bfddef73f3fae0 (patch) | |
| tree | c8851235188aa3e48f7069c8a6004e40b304d253 /core/java/android/net/dhcp | |
| parent | 5216f11e462b9f17704c0ac9e193d2149f3fa755 (diff) | |
| download | frameworks_base-d396a448b2e36e29598c954b64bfddef73f3fae0.zip frameworks_base-d396a448b2e36e29598c954b64bfddef73f3fae0.tar.gz frameworks_base-d396a448b2e36e29598c954b64bfddef73f3fae0.tar.bz2 | |
Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
Diffstat (limited to 'core/java/android/net/dhcp')
| -rw-r--r-- | core/java/android/net/dhcp/DhcpPacket.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/dhcp/DhcpPacket.java b/core/java/android/net/dhcp/DhcpPacket.java index 7d2bd69..317a9b4 100644 --- a/core/java/android/net/dhcp/DhcpPacket.java +++ b/core/java/android/net/dhcp/DhcpPacket.java @@ -7,7 +7,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.nio.charset.Charsets; +import java.nio.charset.StandardCharsets; import java.nio.ShortBuffer; import java.util.ArrayList; @@ -540,7 +540,7 @@ abstract class DhcpPacket { private static String readAsciiString(ByteBuffer buf, int byteCount) { byte[] bytes = new byte[byteCount]; buf.get(bytes); - return new String(bytes, 0, bytes.length, Charsets.US_ASCII); + return new String(bytes, 0, bytes.length, StandardCharsets.US_ASCII); } /** |