summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jack He <siyuanh@google.com> 2021-03-23 18:06:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-23 18:06:48 +0000
commitc1d92b8ddda685655679d2c98ac81179fcbe03c3 (patch)
treef386a2985464525a3d1f557b41020d096dd77e66
parentc74b9c7ac973deff9bca4b65db8b61d79f0f32e7 (diff)
parentb4d4127efbc3d273352e186116042499b1930291 (diff)
Merge "ScanFilter.setDeviceAddress: Should send deviceAddress instead of mDeviceAddress to the next level" am: b4d4127efb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649650 Change-Id: I0d03d4dead5e30072b115feada9c199b15c46897
-rw-r--r--core/java/android/bluetooth/le/ScanFilter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/le/ScanFilter.java b/core/java/android/bluetooth/le/ScanFilter.java
index 86721502d409..3c20dcac8ca3 100644
--- a/core/java/android/bluetooth/le/ScanFilter.java
+++ b/core/java/android/bluetooth/le/ScanFilter.java
@@ -587,7 +587,7 @@ public final class ScanFilter implements Parcelable {
* @throws IllegalArgumentException If the {@code deviceAddress} is invalid.
*/
public Builder setDeviceAddress(String deviceAddress) {
- return setDeviceAddress(mDeviceAddress, BluetoothDevice.ADDRESS_TYPE_PUBLIC);
+ return setDeviceAddress(deviceAddress, BluetoothDevice.ADDRESS_TYPE_PUBLIC);
}
/**