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

Commit 5509a10c authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "When wifi wants ASCII lowercasing, it needs to ask for it." into cm-10.2

parents 93712566 9b829a9d

core/java/android/content/Intent.java

+1 −1
Original line number Diff line number Diff line
@@ -7046,7 +7046,7 @@ public class Intent implements Parcelable, Cloneable { 
            return null;

        }



        type = type.trim().toLowerCase(Locale.US);

        type = type.trim().toLowerCase(Locale.ROOT);



        final int semicolonIndex = type.indexOf(';');

        if (semicolonIndex != -1) {

core/java/android/database/DatabaseUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ public class DatabaseUtils { 
        if (sql.length() < 3) {

            return STATEMENT_OTHER;

        }

        String prefixSql = sql.substring(0, 3).toUpperCase(Locale.US);

        String prefixSql = sql.substring(0, 3).toUpperCase(Locale.ROOT);

        if (prefixSql.equals("SEL")) {

            return STATEMENT_SELECT;

        } else if (prefixSql.equals("INS") ||

core/java/android/net/MailTo.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.net;



import java.util.HashMap;

import java.util.Locale;

import java.util.Map;

import java.util.Set;
@@ -84,7 +85,7 @@ public class MailTo { 
                }

                // insert the headers with the name in lowercase so that

                // we can easily find common headers

                m.mHeaders.put(Uri.decode(nameval[0]).toLowerCase(), 

                m.mHeaders.put(Uri.decode(nameval[0]).toLowerCase(Locale.ROOT),

                        nameval.length > 1 ? Uri.decode(nameval[1]) : null);

            }

        }

core/java/android/net/NetworkConfig.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.net;



import android.util.Log;

import java.util.Locale;



/**

 * Describes the buildtime configuration of a network.
@@ -63,7 +64,7 @@ public class NetworkConfig { 
     */

    public NetworkConfig(String init) {

        String fragments[] = init.split(",");

        name = fragments[0].trim().toLowerCase();

        name = fragments[0].trim().toLowerCase(Locale.ROOT);

        type = Integer.parseInt(fragments[1]);

        radio = Integer.parseInt(fragments[2]);

        priority = Integer.parseInt(fragments[3]);

core/java/android/net/ProxyProperties.java

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.util.Log; 
import java.net.InetAddress;

import java.net.InetSocketAddress;

import java.net.UnknownHostException;

import java.util.Locale;



/**

 * A container class for the http proxy info
@@ -87,7 +88,7 @@ public class ProxyProperties implements Parcelable { 
        if (mExclusionList == null) {

            mParsedExclusionList = new String[0];

        } else {

            String splitExclusionList[] = exclusionList.toLowerCase().split(",");

            String splitExclusionList[] = exclusionList.toLowerCase(Locale.ROOT).split(",");

            mParsedExclusionList = new String[splitExclusionList.length * 2];

            for (int i = 0; i < splitExclusionList.length; i++) {

                String s = splitExclusionList[i].trim();