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

Commit 4f65db84 authored by Omair Kamil's avatar Omair Kamil Committed by Gerrit Code Review
Browse files

Merge "Check for null manufacturer data when matching scan filter." into main

parents a6ffa20c 5dc33eef

framework/java/android/bluetooth/le/ScanFilter.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -492,7 +492,7 @@ public final class ScanFilter implements Parcelable { 
        }

        }





        // Manufacturer data match.

        // Manufacturer data match.

        if (mManufacturerId >= 0) {

        if (mManufacturerId >= 0 && mManufacturerData != null) {

            if (!matchesPartialData(

            if (!matchesPartialData(

                    mManufacturerData,

                    mManufacturerData,

                    mManufacturerDataMask,

                    mManufacturerDataMask,