commit bb49a491a1d67129a503a87d1b2f5b8f3d62cfd1
author Hansong Zhang <hsz@google.com> Thu Apr 26 14:22:39 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 25 19:00:00 2018 +0000
tree 6a4d4941ad716209041e5228e9a6bd2ec8afa3a6
parent 7759162d046bcb14886fbd90215f4b058ca64c8a

DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name

Test: manual
Bug: 73173182
Change-Id: I7f2201cab36adf7f01d1a794d783cb78a536811f
(cherry picked from commit 24da173b63b17a0bc6c80b2fcfefa7fe4574a15b)

core/java/android/bluetooth/BluetoothDevice.java

diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 98cd319..9498f12 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -808,7 +808,11 @@
             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);
         }