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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616111 Change-Id: I9999e1ba63d697298d037aee29f7a449ba9cb008
2021-08-31 23:18:56 +00:00
parent 20e186c3d5 f6db6bcb3e
commit a6e0765cab
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/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);
        }