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

Commit 1ca3412e authored by Omair Kamil's avatar Omair Kamil Committed by Automerger Merge Worker
Browse files

Merge "Remove unused loop parameter in ScanManager and add comment on its... 

Merge "Remove unused loop parameter in ScanManager and add comment on its intended behavior." into main am: d7a1a18b am: ca837dce

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2994454



Change-Id: Ied233bc82c7b7d38a294a4d6d2abab8772d18793
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d0bb4ad ca837dce

android/app/src/com/android/bluetooth/le_scan/ScanManager.java

+8 −5
Original line number Diff line number Diff line
@@ -1354,11 +1354,14 @@ public class ScanManager { 
            }

            int deliveryMode = getDeliveryMode(client);

            if (deliveryMode == DELIVERY_MODE_ON_FOUND_LOST) {

                for (ScanFilter filter : client.filters) {

                    int entriesToFree = getNumOfTrackingAdvertisements(client.settings);

                    if (!manageAllocationOfTrackingAdvertisement(entriesToFree, false)) {

                        Log.e(TAG, "Error freeing for onfound/onlost filter resources "

                                + entriesToFree);

                // Decrement the count of trackable advertisements in use

                int entriesToFreePerFilter = getNumOfTrackingAdvertisements(client.settings);

                for (int i = 0; i < client.filters.size(); i++) {

                    if (!manageAllocationOfTrackingAdvertisement(entriesToFreePerFilter, false)) {

                        Log.e(

                                TAG,

                                "Error freeing for onfound/onlost filter resources "

                                        + entriesToFreePerFilter);

                        try {

                            mScanHelper.onScanManagerErrorCallback(

                                    client.scannerId, ScanCallback.SCAN_FAILED_INTERNAL_ERROR);