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

Commit b8097cd4 authored by Swami Dhyan Anurag's avatar Swami Dhyan Anurag Committed by Gerrit - the friendly Code Review server
Browse files

Bluetooth: Fix Klocwork issues in LE 

Fix Klocwork issues in LE in frameworks/base.

Change-Id: I3dbd06be4c486390ead91043a9d1a08141a48eff
parent 71b855d4

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

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



        // Manufacturer data match.

        if (mManufacturerId >= 0) {

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

            if (!matchesPartialData(mManufacturerData, mManufacturerDataMask,

                    scanRecord.getManufacturerSpecificData(mManufacturerId))) {

                return false;
@@ -350,7 +350,7 @@ public final class ScanFilter implements Parcelable { 


    // Check whether the data pattern matches the parsed data.

    private boolean matchesPartialData(byte[] data, byte[] dataMask, byte[] parsedData) {

        if (parsedData == null || parsedData.length < data.length) {

        if (parsedData == null || data == null || parsedData.length < data.length) {

            return false;

        }

        if (dataMask == null) {