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

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

Change-Id: Iac403f5118d55d9919745d98eba260dd2929d56c

parents 56305641 984dfe07

core/java/android/bluetooth/BluetoothDevice.java

+5 −1

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