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

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

Change-Id: I12322ddbacc848912426bacaa49469d6d5982c60

parents 167b3c5e a8ea95fd

framework/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;
		}