diff options
| author | Bill Yi <byi@google.com> | 2021-11-02 21:07:53 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2021-11-02 21:07:53 -0700 |
| commit | ba584f1fa1847eb6eb5d99300541551f70f1ad3a (patch) | |
| tree | 104a5c2aa61afc895df77b9c90803342faee0698 /core/java/android/bluetooth/BluetoothDevice.java | |
| parent | 74ef57b88530c122276b496472a537a278d94600 (diff) | |
| parent | c53e71dc397de7486c9a8899f71598c3c3a18d44 (diff) | |
Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I7e267e3c046d726750180efa81806cbbefb17b68
Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: Ic3cd62083de4219dbf52f568ca4f34bdc7a08516
Diffstat (limited to 'core/java/android/bluetooth/BluetoothDevice.java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index c71fcc637cb9..6e918bd6243d 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1340,7 +1340,10 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (alias == null) { return getName(); } - return alias; + return alias + .replace('\t', ' ') + .replace('\n', ' ') + .replace('\r', ' '); } catch (RemoteException e) { Log.e(TAG, "", e); } |