diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-12 00:37:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 00:37:15 +0000 |
| commit | 1a2da29dba3ea88d4ea995a12ff0e0a65637320f (patch) | |
| tree | 6e24ceae7046a82e549fa84ee095a96848013aba | |
| parent | aabcb3e3e9be1970b228593f51dfeae538dea1dd (diff) | |
| parent | 833b8108c9f5172b6b01bdd7368289bb6278a826 (diff) | |
Merge "Bluetooth ScanFilter: Allow null in setDeviceAddress" am: 561b4c8aad am: d828a59648 am: 833b8108c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702025
Change-Id: I48df730d65443e2417acf24d563ef7d7ad780340
| -rw-r--r-- | framework/java/android/bluetooth/le/ScanFilter.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/le/ScanFilter.java b/framework/java/android/bluetooth/le/ScanFilter.java index c5c4277d9e..dfef47ddc1 100644 --- a/framework/java/android/bluetooth/le/ScanFilter.java +++ b/framework/java/android/bluetooth/le/ScanFilter.java @@ -586,6 +586,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); } |