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

Commit ca837dce 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

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



Change-Id: I61cac93cd7fdbc9c7eb3406a7bea5b2b8f75ab23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dce18451 d7a1a18b

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