diff options
| author | Elliott Hughes <enh@google.com> | 2012-11-29 09:14:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-29 09:14:35 -0800 |
| commit | 565de5f6cb75631f6b23011fcac4fcf8be8d5c5e (patch) | |
| tree | a89d627283da6d1816dc571c54566b3e5a61b2f5 /core/java/android/os | |
| parent | 518127549997fbf01fd3af59c4312e43f137e194 (diff) | |
| parent | 820b3e29caab93de9535f18d98c6fd264c7fa983 (diff) | |
| download | frameworks_base-565de5f6cb75631f6b23011fcac4fcf8be8d5c5e.zip frameworks_base-565de5f6cb75631f6b23011fcac4fcf8be8d5c5e.tar.gz frameworks_base-565de5f6cb75631f6b23011fcac4fcf8be8d5c5e.tar.bz2 | |
am 820b3e29: Merge "Make transactGetSockaddr locale safe"
* commit '820b3e29caab93de9535f18d98c6fd264c7fa983':
Make transactGetSockaddr locale safe
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/CommonTimeUtils.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/core/java/android/os/CommonTimeUtils.java b/core/java/android/os/CommonTimeUtils.java index 9081ee4..20755d9 100644 --- a/core/java/android/os/CommonTimeUtils.java +++ b/core/java/android/os/CommonTimeUtils.java @@ -19,6 +19,7 @@ import java.net.InetAddress; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetSocketAddress; +import java.util.Locale; import static libcore.io.OsConstants.*; class CommonTimeUtils { @@ -192,10 +193,11 @@ class CommonTimeUtils { if (AF_INET == type) { int addr = reply.readInt(); port = reply.readInt(); - addrStr = String.format("%d.%d.%d.%d", (addr >> 24) & 0xFF, - (addr >> 16) & 0xFF, - (addr >> 8) & 0xFF, - addr & 0xFF); + addrStr = String.format(Locale.US, "%d.%d.%d.%d", + (addr >> 24) & 0xFF, + (addr >> 16) & 0xFF, + (addr >> 8) & 0xFF, + addr & 0xFF); } else if (AF_INET6 == type) { int addr1 = reply.readInt(); int addr2 = reply.readInt(); @@ -207,11 +209,11 @@ class CommonTimeUtils { int flowinfo = reply.readInt(); int scope_id = reply.readInt(); - addrStr = String.format("[%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X]", - (addr1 >> 16) & 0xFFFF, addr1 & 0xFFFF, - (addr2 >> 16) & 0xFFFF, addr2 & 0xFFFF, - (addr3 >> 16) & 0xFFFF, addr3 & 0xFFFF, - (addr4 >> 16) & 0xFFFF, addr4 & 0xFFFF); + addrStr = String.format(Locale.US, "[%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X]", + (addr1 >> 16) & 0xFFFF, addr1 & 0xFFFF, + (addr2 >> 16) & 0xFFFF, addr2 & 0xFFFF, + (addr3 >> 16) & 0xFFFF, addr3 & 0xFFFF, + (addr4 >> 16) & 0xFFFF, addr4 & 0xFFFF); } if (null != addrStr) { |