Commit 03567d80 authored Aug 31, 2021 by TreeHugger Robot Committed by Automerger Merge Worker Aug 31, 2021

Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a30763...

Merge "Bluetooth: Fix formatting in getAlias()" into rvc-dev am: 16a30763 am: f6db6bcb am: a6e0765c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616111

Change-Id: I94bd7e46b1c80e5ce2b5cdae518a51798d827948

core/java/android/bluetooth/BluetoothDevice.java

+4 −1

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