diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-31 23:32:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-31 23:32:23 +0000 |
| commit | dce191bcf877f59f8b2fa0961fc0d35262584645 (patch) | |
| tree | 843d1d679baa83d2ed5ddae3f3a0872716c8dfe6 /core/java | |
| parent | 3e869328d4b83c108b88d8be158a408cee4a340c (diff) | |
| parent | a6e0765cab331f3f91fb72e003c9d08e35be303d (diff) | |
Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a307631e am: f6db6bcb3e am: a6e0765cab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616111
Change-Id: I4a77bf1660f9248bf334b14852d40dd2dc53d932
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index bbb550fd6343..5a5fac4a7664 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1329,7 +1329,10 @@ public final class BluetoothDevice implements Parcelable, Attributable { if (alias == null) { return getName(); } - return alias; + return alias + .replace('\t', ' ') + .replace('\n', ' ') + .replace('\r', ' '); } catch (RemoteException e) { Log.e(TAG, "", e); } |