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

2021-09-01 23:50:38 +00:00
parent a0226b4d47 3bdad2df2e
commit 44dc2b273b
1 changed files with 8 additions and 1 deletions
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -894,7 +894,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);
        }