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

Commit 98221171 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] DO NOT MERGE Truncate newline and tab characters in... 

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ec am: b906043c

Change-Id: I12322ddbacc848912426bacaa49469d6d5982c60
parents 10413b94 b906043c

core/java/android/bluetooth/BluetoothDevice.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -727,7 +727,11 @@ public final class BluetoothDevice implements Parcelable { 
            return null;

            return null;

        }

        }

        try {

        try {

            return sService.getRemoteName(this);

            String name = sService.getRemoteName(this);

            if (name != null) {

                return name.replaceAll("[\\t\\n\\r]+", " ");

            }

            return null;

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        return null;

        return null;

    }

    }