diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-01 03:47:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-01 03:47:30 +0000 |
| commit | c2fc45f5b14d8c155c7b5130f01d5ef47110fc43 (patch) | |
| tree | 3d1e77101c61253aa2ef575b1d9e5d5404a08b84 | |
| parent | 66bdd0f981c71477ae21abb5bb8f7f3cefd47e51 (diff) | |
| parent | 635954a7707499e089b80c97d3054bf4989c3a1f (diff) | |
Merge "Sanitize Bluetooth device names without regex" am: d012f6a977 am: 635954a770
Change-Id: I044fa2a33359b90724e68f89b1762e0e2b3b196a
| -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 3e1a480b4f..2a4cec013f 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -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) { |