diff options
| author | Hansong Zhang <hsz@google.com> | 2018-04-26 14:22:39 -0700 |
|---|---|---|
| committer | Tim Schumacher <timschumi@gmx.de> | 2018-07-16 20:50:58 +0200 |
| commit | e8dc0fe9b20af7d2f88746849124531927d9a3ee (patch) | |
| tree | 44f4192fdd409808b0b621bfb7ec2657c75ba738 | |
| parent | 63cbf29d4faf621127e618e86b2d6ed7012fc781 (diff) | |
| download | frameworks_base-e8dc0fe9b20af7d2f88746849124531927d9a3ee.tar.gz frameworks_base-e8dc0fe9b20af7d2f88746849124531927d9a3ee.tar.bz2 frameworks_base-e8dc0fe9b20af7d2f88746849124531927d9a3ee.zip | |
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 d7d248f650f..df84f823f39 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -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; } |