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

Merge "Only do the ble scan if association isNotifyOnDeviceNearby" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-14 20:54:06 +00:00
committed by Android (Google) Code Review
parent 7fa9ff82b3 dd0e2f32f0
commit 6ad21dae20
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -671,6 +671,9 @@ public class CompanionDeviceManagerService extends SystemService {
association = AssociationInfo.builder(association) association = AssociationInfo.builder(association)
.setNotifyOnDeviceNearby(active) .setNotifyOnDeviceNearby(active)
.build(); .build();
// Do not need to call {@link BleCompanionDeviceScanner#restartScan()} since it will
// trigger {@link BleCompanionDeviceScanner#restartScan(int, AssociationInfo)} when
// an application sets/unsets the mNotifyOnDeviceNearby flag.
mAssociationStore.updateAssociation(association); mAssociationStore.updateAssociation(association);
// TODO(b/218615198): correctly handle the case when the device is currently present. // TODO(b/218615198): correctly handle the case when the device is currently present.

2
services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java
View File

@@ -194,6 +194,8 @@ class BleCompanionDeviceScanner implements AssociationStore.OnChangeListener {
// Collect MAC addresses from all associations. // Collect MAC addresses from all associations.
final Set<String> macAddresses = new HashSet<>(); final Set<String> macAddresses = new HashSet<>();
for (AssociationInfo association : mAssociationStore.getAssociations()) { for (AssociationInfo association : mAssociationStore.getAssociations()) {
if (!association.isNotifyOnDeviceNearby()) continue;
// Beware that BT stack does not consider low-case MAC addresses valid, while // Beware that BT stack does not consider low-case MAC addresses valid, while
// MacAddress.toString() return a low-case String. // MacAddress.toString() return a low-case String.
final String macAddress = association.getDeviceMacAddressAsString(); final String macAddress = association.getDeviceMacAddressAsString();