commit 561b4c8aad3ca4b83c1a946a783b134bc04bfac8
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 11 23:38:35 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 11 23:38:35 2021 +0000
tree f8eebe1c39f001f38e2adbfe24fc87e912c420d8
parent 844e7e7f6b60047da704a5c4ad8405757c7b0157
parent 025714ff3391b362e219d292f3d6e5ee33f29f5e

Merge "Bluetooth ScanFilter: Allow null in setDeviceAddress"

core/java/android/bluetooth/le/ScanFilter.java

diff --git a/core/java/android/bluetooth/le/ScanFilter.java b/core/java/android/bluetooth/le/ScanFilter.java
index 3c20dca..a74c663 100644
--- a/core/java/android/bluetooth/le/ScanFilter.java
+++ b/core/java/android/bluetooth/le/ScanFilter.java
@@ -587,6 +587,10 @@
          * @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);
         }