Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into nyc-dev

core/java/android/bluetooth/BluetoothDevice.java

@@ -727,7 +727,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;
     }