summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jack He <siyuanh@google.com> 2021-03-23 18:51:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-23 18:51:54 +0000
commit7617088bd90bb28aad34a9efdb9a0951ae3267ff (patch)
tree35e998272bbc3604148d2403db9d7e3bf2d72547
parentc33747c5f02a0ab429432b95a4134da73d86cf70 (diff)
parentc1d92b8ddda685655679d2c98ac81179fcbe03c3 (diff)
Merge "ScanFilter.setDeviceAddress: Should send deviceAddress instead of mDeviceAddress to the next level" am: b4d4127efb am: c1d92b8ddd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649650 Change-Id: Ic837f5d83afad29865c975e54c55e0133a2f50f2
-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);
}
/**