mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-02-26 17:31:16 -05:00
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hansong Zhang <hsz@google.com>
|
|
Date: Wed, 18 Aug 2021 16:35:00 -0700
|
|
Subject: [PATCH] DO NOT MERGE Bluetooth: Fix formatting in getAlias()
|
|
|
|
Bug: 180747689
|
|
Test: manual
|
|
Change-Id: Ic309f4aad116fd424d5d0d0e2016d61be8826b78
|
|
(cherry picked from commit 3bdad2df2e34c948bde80a51ae232c46848dab06)
|
|
---
|
|
core/java/android/bluetooth/BluetoothDevice.java | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
|
|
index 9498f125c2a6..7918e449acfb 100644
|
|
--- a/core/java/android/bluetooth/BluetoothDevice.java
|
|
+++ b/core/java/android/bluetooth/BluetoothDevice.java
|
|
@@ -855,7 +855,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);
|
|
}
|