[automerger] DO NOT MERGE Truncate newline and tab characters in...

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: fd9c48de am: 8fbe4bce1e

Change-Id: If7693b2ff5785a1a09920061b318aaac33f5d6b6

parents b65fcfd9 fd9c48de

framework/java/android/bluetooth/BluetoothDevice.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}