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

Commit ead8f892 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Truncate newline and tab characters in BluetoothDevice name" into pi-dev 

am: 69b1fce5

Change-Id: Ib23eddfe8efeebccf6d5c9ecdb2ef7debf555aa9
parents 98fa2212 69b1fce5

core/java/android/bluetooth/BluetoothDevice.java

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

        }

        try {

            return service.getRemoteName(this);

            String name = service.getRemoteName(this);

            if (name != null) {

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

            }

            return null;

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        }