diff options
| author | Hansong Zhang <hsz@google.com> | 2018-04-26 14:22:39 -0700 |
|---|---|---|
| committer | Tim Schumacher <timschumi@gmx.de> | 2018-07-17 07:26:28 +0200 |
| commit | e4365237c574a8fd74040d6485c8c9e1bfd86f57 (patch) | |
| tree | cc9dbeb26730326dadf11825afe82fa9a3577cbe | |
| parent | 3ff2fa27049d4211dcf7aafdc2fb13d997d5e2eb (diff) | |
| download | android_frameworks_base-e4365237c574a8fd74040d6485c8c9e1bfd86f57.tar.gz android_frameworks_base-e4365237c574a8fd74040d6485c8c9e1bfd86f57.tar.bz2 android_frameworks_base-e4365237c574a8fd74040d6485c8c9e1bfd86f57.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 71148180cbd..83edb34b6e4 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -648,7 +648,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; } |