Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9161c83b authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "ScanFilter.setDeviceAddress: Should send deviceAddress instead of... 

Merge "ScanFilter.setDeviceAddress: Should send deviceAddress instead of mDeviceAddress to the next level" am: b4d4127e am: c1d92b8d am: 7617088b am: 4acab1d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649650

Change-Id: Ic65cdad8d38e46ed45d2beffa9b49ce7580d9fdc
parents 31703d82 4acab1d9

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }



        /**