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

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

Change-Id: I3f951fac78c6e2da84eac511d3b0e19141e90153

parents 039d8b59 b6cde9ec

core/java/android/bluetooth/BluetoothDevice.java

+5 −1

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