Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev

2021-09-02 01:20:06 +00:00
parent 34709e93e6 e15791bbe1
commit 204ab511e0
1 changed files with 8 additions and 1 deletions
--- 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);
        }