summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-05-11 23:38:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-05-11 23:38:35 +0000
commit561b4c8aad3ca4b83c1a946a783b134bc04bfac8 (patch)
treef8eebe1c39f001f38e2adbfe24fc87e912c420d8 /core/java
parent844e7e7f6b60047da704a5c4ad8405757c7b0157 (diff)
parent025714ff3391b362e219d292f3d6e5ee33f29f5e (diff)
Merge "Bluetooth ScanFilter: Allow null in setDeviceAddress"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/bluetooth/le/ScanFilter.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/le/ScanFilter.java b/core/java/android/bluetooth/le/ScanFilter.java
index 3c20dcac8ca3..a74c663a9ce7 100644
--- a/core/java/android/bluetooth/le/ScanFilter.java
+++ b/core/java/android/bluetooth/le/ScanFilter.java
@@ -587,6 +587,10 @@ public final class ScanFilter implements Parcelable {
* @throws IllegalArgumentException If the {@code deviceAddress} is invalid.
*/
public Builder setDeviceAddress(String deviceAddress) {
+ if (deviceAddress == null) {
+ mDeviceAddress = deviceAddress;
+ return this;
+ }
return setDeviceAddress(deviceAddress, BluetoothDevice.ADDRESS_TYPE_PUBLIC);
}