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

Commit e8dc0fe9 authored by Hansong Zhang's avatar Hansong Zhang Committed by Tim Schumacher
Browse files

DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name 

Test: manual
Bug: 73173182
Change-Id: I7f2201cab36adf7f01d1a794d783cb78a536811f
(cherry picked from commit 24da173b)
parent 63cbf29d

core/java/android/bluetooth/BluetoothDevice.java

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

    }