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

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

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

Merge "Bluetooth ScanFilter: Allow null in setDeviceAddress" am: 561b4c8aad am: d828a596 am: 833b8108 am: 1a2da29d

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

Change-Id: I714f9eeb29f7cb7b7ed6bdb9c064690ff1e5e3f1
parents ff6066ef 1a2da29d

framework/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);

        }