commit | afa5f3c37aea6dd0e14576c035d12fa84c95f2cb | [log] [tgz] |
---|---|---|
author | Hansong Zhang <hsz@google.com> | Wed Aug 18 16:35:00 2021 -0700 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Sep 15 00:10:18 2021 +0000 |
tree | 16849087872b0d4b45449d4dbf2fc4757db54ac9 | |
parent | 9a4e52fa566169d5dd78d672fa3be048de9b0041 [diff] |
Bluetooth: Fix formatting in getAlias() Bug: 180747689 Test: manual Change-Id: Ic309f4aad116fd424d5d0d0e2016d61be8826b78 (cherry picked from commit 3c4a917cb9481f4b70c26b6a06e798e65e5895ce)
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index bbb550f..5a5fac4 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1329,7 +1329,10 @@ if (alias == null) { return getName(); } - return alias; + return alias + .replace('\t', ' ') + .replace('\n', ' ') + .replace('\r', ' '); } catch (RemoteException e) { Log.e(TAG, "", e); }