am 5d6b7db5: am 20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask...

* commit '5d6b7db5d9cb7de5cee45dd35af18e179f01d583':
  When wifi wants ASCII lowercasing, it needs to ask for it.

diff --cc wifi/java/android/net/wifi/WifiStateMachine.java
Simple merge

diff --cc wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java
index cab817d,9879d4e..a4118dc
--- 1/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java
--- 2/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java
+++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java
@@@ -184,11 -184,11 +184,11 @@@ public class WifiP2pDnsSdServiceInfo ex
           * |   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("%04x", dnsType));
 -        sb.append(String.format("%02x", version));
 +        sb.append(String.format(Locale.US, "%04x", dnsType));
 +        sb.append(String.format(Locale.US, "%02x", version));
  
          return sb.toString();
      }

diff --cc wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java
Simple merge