[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c

Change-Id: Iac403f5118d55d9919745d98eba260dd2929d56c
This commit is contained in:
Android Build Merger (Role)
2018-04-26 21:18:14 +00:00

View File

@@ -723,7 +723,11 @@ public final class BluetoothDevice implements Parcelable {
return null; return null;
} }
try { 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);} } catch (RemoteException e) {Log.e(TAG, "", e);}
return null; return null;
} }