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

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

Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev 

am: 2c72a464

Change-Id: Ib34226b3ce41e83ae018c86d5a4e53564e207b46
parents f8ff1f77 2c72a464

framework/java/android/bluetooth/BluetoothDevice.java

+5 −1
Original line number Diff line number Diff line
@@ -808,7 +808,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;

    }