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

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

View File

@@ -724,7 +724,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;
} }