Commit 7b90d02e authored May 03, 2018 by android-build-team Robot Committed by Android (Google) Code Review May 03, 2018

Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into nyc-dr1-dev

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

parents 7306da71 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;
		}