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

Commit 65d3f63d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I044fa2a33359b90724e68f89b1762e0e2b3b196a
parents 5cd20c9e b8f0a92e

core/java/android/bluetooth/BluetoothDevice.java

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

            String name = service.getRemoteName(this);

            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;

        } catch (RemoteException e) {