diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-01 03:34:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-01 03:34:53 +0000 |
| commit | 635954a7707499e089b80c97d3054bf4989c3a1f (patch) | |
| tree | 5220db0b01e6e98182dabadc74052068f860fa2d /framework/java | |
| parent | 7c20afdf4b44ae924b8386299b9b3b9b7c89e150 (diff) | |
| parent | d012f6a977b63df3bd2e20e3957f4628dab0cc7e (diff) | |
Merge "Sanitize Bluetooth device names without regex" am: d012f6a977
Change-Id: I97c50cc31e681e53cc74d76803e3e24566b7e5dd
Diffstat (limited to 'framework/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 12eee73f5f..0c3959abe1 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) { |