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

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

View File

@@ -724,7 +724,11 @@ public final class BluetoothDevice implements Parcelable {
return null;
}
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);}
return null;
}