Merge SP1A.211105.004 to aosp-master - DO NOT MERGE

Merged-In: I7e267e3c046d726750180efa81806cbbefb17b68
Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: Ic3cd62083de4219dbf52f568ca4f34bdc7a08516

parents abaa3e7f 730dd566

framework/java/android/bluetooth/BluetoothDevice.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -1340,7 +1340,10 @@ public final class BluetoothDevice implements Parcelable, Attributable {
		if (alias == null) {
		return getName();
		}
		return alias;
		return alias
		.replace('\t', ' ')
		.replace('\n', ' ')
		.replace('\r', ' ');
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		}