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

Commit 6bf42aea authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into cw-f-dev 

* changes:
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ec am: b906043c am: 98221171
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ec am: b906043c
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ec
  DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
parents d72de1bd 2b41ff76

core/java/android/bluetooth/BluetoothDevice.java

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

        }

        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);}

        return null;

    }