diff options
| author | Elliott Hughes <enh@google.com> | 2013-08-02 09:50:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-02 09:50:44 -0700 |
| commit | e899d7c0297c499398252f736cb11ffe7ef4f2e3 (patch) | |
| tree | 52b643438213fcf9ea626729dc6a236dd2030e98 /wifi/java/android | |
| parent | 7342c66afc924fba659f2da045ce7420b8baf6d4 (diff) | |
| parent | 5d6b7db5d9cb7de5cee45dd35af18e179f01d583 (diff) | |
| download | frameworks_base-e899d7c0297c499398252f736cb11ffe7ef4f2e3.zip frameworks_base-e899d7c0297c499398252f736cb11ffe7ef4f2e3.tar.gz frameworks_base-e899d7c0297c499398252f736cb11ffe7ef4f2e3.tar.bz2 | |
am 5d6b7db5: am 20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
* commit '5d6b7db5d9cb7de5cee45dd35af18e179f01d583':
When wifi wants ASCII lowercasing, it needs to ask for it.
Diffstat (limited to 'wifi/java/android')
4 files changed, 6 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 502d1ab..5d130c6 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -26,6 +26,7 @@ import java.net.InetAddress; import java.net.Inet4Address; import java.net.UnknownHostException; import java.util.EnumMap; +import java.util.Locale; /** * Describes the state of any Wifi connection that is active or @@ -275,7 +276,7 @@ public class WifiInfo implements Parcelable { return SupplicantState.FOUR_WAY_HANDSHAKE; else { try { - return SupplicantState.valueOf(stateName.toUpperCase()); + return SupplicantState.valueOf(stateName.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException e) { return SupplicantState.INVALID; } diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 72ebb5b..4628c91 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -83,6 +83,7 @@ import java.io.PrintWriter; import java.net.InetAddress; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicBoolean; import java.util.Iterator; @@ -2515,7 +2516,7 @@ public class WifiStateMachine extends StateMachine { case CMD_SET_COUNTRY_CODE: String country = (String) message.obj; if (DBG) log("set country code " + country); - if (!mWifiNative.setCountryCode(country.toUpperCase())) { + if (!mWifiNative.setCountryCode(country.toUpperCase(Locale.ROOT))) { loge("Failed to set country code " + country); } break; diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java index cab817d..a4118dc 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java @@ -184,7 +184,7 @@ public class WifiP2pDnsSdServiceInfo extends WifiP2pServiceInfo { * | Type (2) | Version (1) | */ if (dnsType == WifiP2pDnsSdServiceInfo.DNS_TYPE_TXT) { - dnsName = dnsName.toLowerCase(); + dnsName = dnsName.toLowerCase(Locale.ROOT); // TODO: is this right? } sb.append(compressDnsName(dnsName)); sb.append(String.format(Locale.US, "%04x", dnsType)); diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java index 81395c9..7462b85c 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java @@ -169,7 +169,7 @@ public class WifiP2pServiceRequest implements Parcelable { } // check whether query is hex string. - query = query.toLowerCase(); + query = query.toLowerCase(Locale.ROOT); char[] chars = query.toCharArray(); for (char c: chars) { if (!((c >= '0' && c <= '9') || |