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

Commit 7151642b authored by Eugene Susla's avatar Eugene Susla
Browse files

Fix NPE in companion device filter matching

Fixes: 124830832
Test: presubmit
Change-Id: I50da6682052cf01c3100f2cbde227245776d5295
parent 3d6fff4d
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.Parcelable;
import android.util.Log;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;

@@ -78,11 +79,12 @@ public class BluetoothDeviceFilterUtils {

    static boolean matchesServiceUuid(ParcelUuid serviceUuid, ParcelUuid serviceUuidMask,
            BluetoothDevice device) {
        ParcelUuid[] uuids = device.getUuids();
        final boolean result = serviceUuid == null ||
                ScanFilter.matchesServiceUuids(
                        serviceUuid,
                        serviceUuidMask,
                        Arrays.asList(device.getUuids()));
                        uuids == null ? Collections.emptyList() : Arrays.asList(uuids));
        if (DEBUG) debugLogMatchResult(result, device, serviceUuid);
        return result;
    }