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

Commit b8f0a92e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba7 

Change-Id: I97c50cc31e681e53cc74d76803e3e24566b7e5dd
parents b76ef78c 6bd37ba7

core/java/android/bluetooth/BluetoothDevice.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -1025,7 +1025,11 @@ public final class BluetoothDevice implements Parcelable { 
        try {

        try {

            String name = service.getRemoteName(this);

            String name = service.getRemoteName(this);

            if (name != null) {

            if (name != null) {

                return name.replaceAll("[\\t\\n\\r]+", " ");

                // remove whitespace characters from the name

                return name

                        .replace('\t', ' ')

                        .replace('\n', ' ')

                        .replace('\r', ' ');

            }

            }

            return null;

            return null;

        } catch (RemoteException e) {

        } catch (RemoteException e) {