diff options
| author | Hansong Zhang <hsz@google.com> | 2018-04-26 14:22:39 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-10 20:27:25 +0000 |
| commit | 9214edb61c5af7f33f7c0c861966082d9a28e21f (patch) | |
| tree | 6a4d4941ad716209041e5228e9a6bd2ec8afa3a6 | |
| parent | 2c8e19daa390addcacaeefa59df110a13ca911c6 (diff) | |
| download | base-9214edb61c5af7f33f7c0c861966082d9a28e21f.tar.gz | |
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug: 73173182
Change-Id: I7f2201cab36adf7f01d1a794d783cb78a536811f
(cherry picked from commit 24da173b63b17a0bc6c80b2fcfefa7fe4574a15b)
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 98cd319a399a..9498f125c2a6 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -808,7 +808,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); } |