diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-03-01 03:21:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-03-01 03:21:38 +0000 |
| commit | d012f6a977b63df3bd2e20e3957f4628dab0cc7e (patch) | |
| tree | ccc53504154e9f356afb74c602e3745ef807bd3e /framework/java/android/bluetooth/BluetoothDevice.java | |
| parent | 8aa8b299fdcc73026325d62ab4535d8876857241 (diff) | |
| parent | 106cfbf961c79e17db03f591647c22a344dcd8b0 (diff) | |
Merge "Sanitize Bluetooth device names without regex"
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevice.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothDevice.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index 5b60b85f47..838a3b95da 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -1025,7 +1025,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) { |