diff options
| author | Hansong Zhang <hsz@google.com> | 2021-08-18 16:35:00 -0700 |
|---|---|---|
| committer | Hansong Zhang <hsz@google.com> | 2021-09-01 21:18:43 +0000 |
| commit | e15791bbe1591d403423c3dc0b688c5ec19dd61f (patch) | |
| tree | e79c0590d1afd5a8133a68c3d6fa39125e7aa1f5 | |
| parent | d95a81b72059f49bcd6f392e2e44588d10d7aba2 (diff) | |
| download | base-e15791bbe1591d403423c3dc0b688c5ec19dd61f.tar.gz | |
DO NOT MERGE Bluetooth: Fix formatting in getAlias()
Bug: 180747689
Test: manual
Change-Id: Ic309f4aad116fd424d5d0d0e2016d61be8826b78
Merged-In: Ic309f4aad116fd424d5d0d0e2016d61be8826b78
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 388161d76308..362727731c9f 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1059,7 +1059,14 @@ public final class BluetoothDevice implements Parcelable { return null; } try { - return service.getRemoteAlias(this); + String alias = service.getRemoteAlias(this); + if (alias == null) { + return getName(); + } + return alias + .replace('\t', ' ') + .replace('\n', ' ') + .replace('\r', ' '); } catch (RemoteException e) { Log.e(TAG, "", e); } |