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

Commit c27359e6 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Explicit locale when formatting machine strings. 

Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
parent 1710f4ce

framework/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]));

    }

framework/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 {