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

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

Change-Id: I9999e1ba63d697298d037aee29f7a449ba9cb008
This commit is contained in:
TreeHugger Robot
2021-08-31 23:18:56 +00:00
committed by Automerger Merge Worker
parent 20e186c3d5 f6db6bcb3e
commit a6e0765cab
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

@@ -1329,7 +1329,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);
} }