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

Commit 8aa7f3eb authored by Eugene Susla's avatar Eugene Susla Committed by Android (Google) Code Review
Browse files

Merge "Check connected devices in addition to paired ones when matching"

parents ae3b9290 0a9a9a39

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java

+12 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.app.Service; 
import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothManager;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.le.BluetoothLeScanner;

import android.bluetooth.le.ScanCallback;

import android.bluetooth.le.ScanFilter;
@@ -84,6 +85,7 @@ public class DeviceDiscoveryService extends Service { 


    static DeviceDiscoveryService sInstance;



    private BluetoothManager mBluetoothManager;

    private BluetoothAdapter mBluetoothAdapter;

    private WifiManager mWifiManager;

    @Nullable private BluetoothLeScanner mBLEScanner;
@@ -143,7 +145,8 @@ public class DeviceDiscoveryService extends Service { 


        if (DEBUG) Log.i(LOG_TAG, "onCreate()");



        mBluetoothAdapter = getSystemService(BluetoothManager.class).getAdapter();

        mBluetoothManager = getSystemService(BluetoothManager.class);

        mBluetoothAdapter = mBluetoothManager.getAdapter();

        mBLEScanner = mBluetoothAdapter.getBluetoothLeScanner();

        mWifiManager = getSystemService(WifiManager.class);
@@ -188,6 +191,14 @@ public class DeviceDiscoveryService extends Service { 
            for (BluetoothDevice dev : emptyIfNull(mBluetoothAdapter.getBondedDevices())) {

                onDeviceFound(DeviceFilterPair.findMatch(dev, mBluetoothFilters));

            }

            for (BluetoothDevice dev : emptyIfNull(

                    mBluetoothManager.getConnectedDevices(BluetoothProfile.GATT))) {

                onDeviceFound(DeviceFilterPair.findMatch(dev, mBluetoothFilters));

            }

            for (BluetoothDevice dev : emptyIfNull(

                    mBluetoothManager.getConnectedDevices(BluetoothProfile.GATT_SERVER))) {

                onDeviceFound(DeviceFilterPair.findMatch(dev, mBluetoothFilters));

            }

        }



        if (shouldScan(mBluetoothFilters)) {