Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a307631e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616111 Change-Id: Ia7ce6aaebccf6f3460ad576a9e703858584fcd93
2021-08-31 23:00:05 +00:00
parent 54c29aa710 16a307631e
commit f6db6bcb3e
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1081,7 +1081,10 @@ public final class BluetoothDevice implements Parcelable {
            if (alias == null) {
                return getName();
            }
-            return alias;
+            return alias
+                    .replace('\t', ' ')
+                    .replace('\n', ' ')
+                    .replace('\r', ' ');
        } catch (RemoteException e) {
            Log.e(TAG, "", e);
        }