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

Commit 6ad21dae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 7fa9ff82 dd0e2f32

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -671,6 +671,9 @@ public class CompanionDeviceManagerService extends SystemService { 
            association = AssociationInfo.builder(association)

                    .setNotifyOnDeviceNearby(active)

                    .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);



            // TODO(b/218615198): correctly handle the case when the device is currently present.

services/companion/java/com/android/server/companion/presence/BleCompanionDeviceScanner.java

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ class BleCompanionDeviceScanner implements AssociationStore.OnChangeListener { 
        // Collect MAC addresses from all associations.

        final Set<String> macAddresses = new HashSet<>();

        for (AssociationInfo association : mAssociationStore.getAssociations()) {

            if (!association.isNotifyOnDeviceNearby()) continue;



            // Beware that BT stack does not consider low-case MAC addresses valid, while

            // MacAddress.toString() return a low-case String.

            final String macAddress = association.getDeviceMacAddressAsString();