aboutsummaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothDevice.java
diff options
context:
space:
mode:
authorHansong Zhang <hsz@google.com>2021-08-18 16:35:00 -0700
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-09-15 00:10:18 +0000
commit48b07878b044f2c7c6713458a15650da3514bf07 (patch)
treeabcc4a59d2cffa9642436c978cc7ddf7733f29e1 /framework/java/android/bluetooth/BluetoothDevice.java
parentb2de95be8358095a6a64f217c0f5fcbb84709020 (diff)
Bluetooth: Fix formatting in getAlias()
Bug: 180747689 Test: manual Change-Id: Ic309f4aad116fd424d5d0d0e2016d61be8826b78 (cherry picked from commit 4e7449ce893cf3f3019b0201b766d0a784da1754)
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevice.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothDevice.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java
index bbb550fd63..5a5fac4a76 100644
--- a/framework/java/android/bluetooth/BluetoothDevice.java
+++ b/framework/java/android/bluetooth/BluetoothDevice.java
@@ -1329,7 +1329,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);
}