Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eugene Susla
2020-11-12 19:01:03 +00:00
committed by Android (Google) Code Review
parent ae3b92905f 0a9a9a39d9
commit 8aa7f3eb86
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java
View File

@@ -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)) {