Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22ee13d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a30763... 

Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a30763 am: f6db6bcb am: a6e0765c am: dce191bc am: 1e123947

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

Change-Id: Idbb329a407c222780c1349ffa1a862f82e3848aa
parents 7ec53346 1e123947

core/java/android/bluetooth/BluetoothDevice.java

+4 −1
Original line number Diff line number Diff line
@@ -1331,7 +1331,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);

        }