DO NOT MERGE Bluetooth: Fix formatting in getAlias()
Bug: 180747689 Test: manual Change-Id: Ic309f4aad116fd424d5d0d0e2016d61be8826b78
This commit is contained in:
@@ -894,7 +894,14 @@ public final class BluetoothDevice implements Parcelable {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
return service.getRemoteAlias(this);
|
String alias = service.getRemoteAlias(this);
|
||||||
|
if (alias == null) {
|
||||||
|
return getName();
|
||||||
|
}
|
||||||
|
return alias
|
||||||
|
.replace('\t', ' ')
|
||||||
|
.replace('\n', ' ')
|
||||||
|
.replace('\r', ' ');
|
||||||
} catch (RemoteException e) {
|
} catch (RemoteException e) {
|
||||||
Log.e(TAG, "", e);
|
Log.e(TAG, "", e);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user