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

Commit 0381d2ba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Only do the ble scan if association isNotifyOnDeviceNearby" into tm-dev am: 6ad21dae am: b611e4e9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17724033



Change-Id: I77caed6000ec8b8a1c064db9c7ed08bbf7608b79
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e4e4f2d b611e4e9

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