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

Commit 0e15ef39 authored by Wei Wang's avatar Wei Wang Committed by Android Git Automerger
Browse files

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

* commit 'b285042c':
  Make address type agnostic in mac address scan filtering.
parents 4725a2fb b285042c

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

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

import android.bluetooth.le.ScanFilter;

import android.os.ParcelUuid;

import android.util.Log;



import java.util.Arrays;

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



    // Values defined in bluedroid.

    private static final byte DEVICE_TYPE_ALL = 0;

    private static final byte DEVICE_TYPE_ALL = 2;



    class Entry {

        public String address;

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

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

                    gattClientScanFilterAddNative(clientIf, entry.type, filterIndex, 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;



                case ScanFilterQueue.TYPE_SERVICE_DATA: