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

Commit 126713d8 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Explicit locale when formatting machine strings."

parents a283fc95 fea17de7

core/java/android/bluetooth/BluetoothAdapter.java

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import java.util.Collections; 
import java.util.HashSet;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.Locale;

import java.util.Map;

import java.util.Random;

import java.util.Set;
@@ -433,7 +434,7 @@ public final class BluetoothAdapter { 
        if (address == null || address.length != 6) {

            throw new IllegalArgumentException("Bluetooth address must have 6 bytes");

        }

        return new BluetoothDevice(String.format("%02X:%02X:%02X:%02X:%02X:%02X",

        return new BluetoothDevice(String.format(Locale.US, "%02X:%02X:%02X:%02X:%02X:%02X",

                address[0], address[1], address[2], address[3], address[4], address[5]));

    }

core/java/android/bluetooth/BluetoothSocket.java

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import java.io.IOException; 
import java.io.InputStream;

import java.io.OutputStream;

import java.util.List;

import java.util.Locale;

import java.util.UUID;

import android.net.LocalSocket;

import java.nio.ByteOrder;
@@ -473,7 +474,7 @@ public final class BluetoothSocket implements Closeable { 
        return mPort;

    }

    private String convertAddr(final byte[] addr)  {

        return String.format("%02X:%02X:%02X:%02X:%02X:%02X",

        return String.format(Locale.US, "%02X:%02X:%02X:%02X:%02X:%02X",

                addr[0] , addr[1], addr[2], addr[3] , addr[4], addr[5]);

    }

    private String waitSocketSignal(InputStream is) throws IOException {

core/java/android/net/NetworkUtils.java

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

import java.net.UnknownHostException;

import java.util.Collection;

import java.util.Locale;



import android.util.Log;
@@ -223,7 +224,7 @@ public class NetworkUtils { 
    public static InetAddress hexToInet6Address(String addrHexString)

            throws IllegalArgumentException {

        try {

            return numericToInetAddress(String.format("%s:%s:%s:%s:%s:%s:%s:%s",

            return numericToInetAddress(String.format(Locale.US, "%s:%s:%s:%s:%s:%s:%s:%s",

                    addrHexString.substring(0,4),   addrHexString.substring(4,8),

                    addrHexString.substring(8,12),  addrHexString.substring(12,16),

                    addrHexString.substring(16,20), addrHexString.substring(20,24),

core/java/android/net/VpnService.java

+6 −5
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package android.net;



import android.app.Activity;

import android.app.Service;

import android.app.PendingIntent;

import android.app.Service;

import android.content.Context;

import android.content.Intent;

import android.os.Binder;
@@ -30,10 +30,10 @@ import android.os.ServiceManager; 


import com.android.internal.net.VpnConfig;



import java.net.InetAddress;

import java.net.DatagramSocket;

import java.net.Inet4Address;

import java.net.Inet6Address;

import java.net.DatagramSocket;

import java.net.InetAddress;

import java.net.Socket;

import java.util.ArrayList;
@@ -329,7 +329,8 @@ public class VpnService extends Service { 
                throw new IllegalArgumentException("Bad address");

            }



            mAddresses.append(' ' + address.getHostAddress() + '/' +  prefixLength);

            mAddresses.append(' ')

                    .append(address.getHostAddress()).append('/').append(prefixLength);

            return this;

        }
@@ -364,7 +365,7 @@ public class VpnService extends Service { 
                }

            }



            mRoutes.append(String.format(" %s/%d", address.getHostAddress(), prefixLength));

            mRoutes.append(' ').append(address.getHostAddress()).append('/').append(prefixLength);

            return this;

        }

services/java/com/android/server/WiredAccessoryManager.java

+3 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import java.io.FileReader; 
import java.io.FileNotFoundException;

import java.util.ArrayList;

import java.util.List;

import java.util.Locale;



/**

 * <p>WiredAccessoryManager monitors for a wired headset on the main board or dock using
@@ -408,11 +409,11 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks { 
            public String getDevName() { return mDevName; }



            public String getDevPath() {

                return String.format("/devices/virtual/switch/%s", mDevName);

                return String.format(Locale.US, "/devices/virtual/switch/%s", mDevName);

            }



            public String getSwitchStatePath() {

                return String.format("/sys/class/switch/%s/state", mDevName);

                return String.format(Locale.US, "/sys/class/switch/%s/state", mDevName);

            }



            public boolean checkSwitchExists() {