Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e899d7c0 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '5d6b7db5':
  When wifi wants ASCII lowercasing, it needs to ask for it.
parents 7342c66a 5d6b7db5

wifi/java/android/net/wifi/WifiInfo.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import java.net.InetAddress; 
import java.net.Inet4Address;

import java.net.Inet4Address;

import java.net.UnknownHostException;

import java.net.UnknownHostException;

import java.util.EnumMap;

import java.util.EnumMap;

import java.util.Locale;





/**

/**

 * Describes the state of any Wifi connection that is active or

 * 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;

            return SupplicantState.FOUR_WAY_HANDSHAKE;

        else {

        else {

            try {

            try {

                return SupplicantState.valueOf(stateName.toUpperCase());

                return SupplicantState.valueOf(stateName.toUpperCase(Locale.ROOT));

            } catch (IllegalArgumentException e) {

            } catch (IllegalArgumentException e) {

                return SupplicantState.INVALID;

                return SupplicantState.INVALID;

            }

            }

wifi/java/android/net/wifi/WifiStateMachine.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ import java.io.PrintWriter; 
import java.net.InetAddress;

import java.net.InetAddress;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.List;

import java.util.List;

import java.util.Locale;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.Iterator;

import java.util.Iterator;
@@ -2515,7 +2516,7 @@ public class WifiStateMachine extends StateMachine { 
                case CMD_SET_COUNTRY_CODE:

                case CMD_SET_COUNTRY_CODE:

                    String country = (String) message.obj;

                    String country = (String) message.obj;

                    if (DBG) log("set country code " + country);

                    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);

                        loge("Failed to set country code " + country);

                    }

                    }

                    break;

                    break;

wifi/java/android/net/wifi/p2p/nsd/WifiP2pDnsSdServiceInfo.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,7 @@ public class WifiP2pDnsSdServiceInfo extends WifiP2pServiceInfo { 
         * |   Type (2)           | Version (1) |

         * |   Type (2)           | Version (1) |

         */

         */

        if (dnsType == WifiP2pDnsSdServiceInfo.DNS_TYPE_TXT) {

        if (dnsType == WifiP2pDnsSdServiceInfo.DNS_TYPE_TXT) {

            dnsName = dnsName.toLowerCase();

            dnsName = dnsName.toLowerCase(Locale.ROOT); // TODO: is this right?

        }

        }

        sb.append(compressDnsName(dnsName));

        sb.append(compressDnsName(dnsName));

        sb.append(String.format(Locale.US, "%04x", dnsType));

        sb.append(String.format(Locale.US, "%04x", dnsType));

wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ public class WifiP2pServiceRequest implements Parcelable { 
        }

        }





        // check whether query is hex string.

        // check whether query is hex string.

        query = query.toLowerCase();

        query = query.toLowerCase(Locale.ROOT);

        char[] chars = query.toCharArray();

        char[] chars = query.toCharArray();

        for (char c: chars) {

        for (char c: chars) {

            if (!((c >= '0' && c <= '9') ||

            if (!((c >= '0' && c <= '9') ||