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

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

Change-Id: I6e5bf8c2f05f44bc292f4c0ec1fcc885a4a24655

parents 1fbcae34 2b41ff76

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