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

Commit b285042c authored by Wei Wang's avatar Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Make address type agnostic in mac address scan filtering." into mnc-dev

parents 55a6373e 1acfd49a

android/app/src/com/android/bluetooth/gatt/ScanFilterQueue.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.bluetooth.gatt; 
import android.bluetooth.BluetoothUuid;

import android.bluetooth.BluetoothUuid;

import android.bluetooth.le.ScanFilter;

import android.bluetooth.le.ScanFilter;

import android.os.ParcelUuid;

import android.os.ParcelUuid;

import android.util.Log;





import java.util.Arrays;

import java.util.Arrays;

import java.util.HashSet;

import java.util.HashSet;
@@ -46,7 +45,7 @@ import java.util.UUID; 
    private static final int MAX_LEN_PER_FIELD = 26;

    private static final int MAX_LEN_PER_FIELD = 26;





    // Values defined in bluedroid.

    // Values defined in bluedroid.

    private static final byte DEVICE_TYPE_ALL = 0;

    private static final byte DEVICE_TYPE_ALL = 2;





    class Entry {

    class Entry {

        public String address;

        public String address;

android/app/src/com/android/bluetooth/gatt/ScanManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -826,7 +826,7 @@ public class ScanManager { 
                    logd("add address " + entry.address);

                    logd("add address " + entry.address);

                    gattClientScanFilterAddNative(clientIf, entry.type, filterIndex, 0, 0, 0, 0, 0,

                    gattClientScanFilterAddNative(clientIf, entry.type, filterIndex, 0, 0, 0, 0, 0,

                            0,

                            0,

                            "", entry.address, (byte) 0, new byte[0], new byte[0]);

                            "", entry.address, (byte) entry.addr_type, new byte[0], new byte[0]);

                    break;

                    break;





                case ScanFilterQueue.TYPE_SERVICE_DATA:

                case ScanFilterQueue.TYPE_SERVICE_DATA: