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

Commit c101bee5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth ScanFilter: Allow null in setDeviceAddress" am: 561b4c8a... 

Merge "Bluetooth ScanFilter: Allow null in setDeviceAddress" am: 561b4c8a am: 05c6b40a am: 32712787 am: ff3c817b

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

Change-Id: I0e8481b2cc46a66df1eb2d146987523b565d30dd
parents 9d7d389e ff3c817b

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

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

        }