commit 69b1fce562fdc8c416756f9b0cfb5e435a4f5c61
author android-build-team Robot <android-build-team-robot@google.com> Mon Apr 30 18:54:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 30 18:54:34 2018 +0000
tree 99e636aedbb3e7e8f683aeda06d05c19809b9c19
parent c84542c9cea63ddbabbf80d7d94d133255e0687b
parent 2e3bf46039dc98e78bb79eeef0e72bc161b1cfb3

Merge "Truncate newline and tab characters in BluetoothDevice name" into pi-dev

core/java/android/bluetooth/BluetoothDevice.java

diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index ac21395..7a6b72e 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -848,7 +848,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);
         }