Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616111

Change-Id: I7bef2353b51718b8dfc4e16d9bd47e53e880fda4
This commit is contained in:
TreeHugger Robot
2021-08-31 23:44:17 +00:00
committed by Automerger Merge Worker
parent b4d83e0463 03567d8023
commit 837108ade1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1331,7 +1331,10 @@ public final class BluetoothDevice implements Parcelable, Attributable {
if (alias == null) { if (alias == null) {
return getName(); return getName();
} }
return alias; return alias
.replace('\t', ' ')
.replace('\n', ' ')
.replace('\r', ' ');
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "", e); Log.e(TAG, "", e);
} }