Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sanitize Bluetooth device names without regex" am: 6bd37ba788

Browse Source 
Change-Id: I97c50cc31e681e53cc74d76803e3e24566b7e5dd
This commit is contained in:
Automerger Merge Worker
2020-03-01 03:34:53 +00:00
parent b76ef78c49 6bd37ba788
commit b8f0a92e0b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1025,7 +1025,11 @@ public final class BluetoothDevice implements Parcelable {
try { try {
String name = service.getRemoteName(this); String name = service.getRemoteName(this);
if (name != null) { if (name != null) {
return name.replaceAll("[\\t\\n\\r]+", " "); // remove whitespace characters from the name
return name
.replace('\t', ' ')
.replace('\n', ' ')
.replace('\r', ' ');
} }
return null; return null;
} catch (RemoteException e) { } catch (RemoteException e) {