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

Commit 10cae785 authored by Jayden Kim's avatar Jayden Kim Committed by Automerger Merge Worker
Browse files

Merge "Record hw scan filter resource exhaustion count" into main am: 07d37e03 

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



Change-Id: Ib44ca1e66f2c4527bcc0c2f68e386a0250361f39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f081514 07d37e03

android/app/src/com/android/bluetooth/gatt/AppScanStats.java

+12 −0
Original line number Diff line number Diff line
@@ -379,6 +379,18 @@ import java.util.Objects; 
                .cacheCount(BluetoothProtoEnums.LE_SCAN_ABUSE_COUNT_SCAN_TIMEOUT, 1);

    }



    synchronized void recordHwFilterNotAvailableCountMetrics() {

        MetricsLogger.getInstance()

                .cacheCount(BluetoothProtoEnums.LE_SCAN_ABUSE_COUNT_HW_FILTER_NOT_AVAILABLE, 1);

    }



    synchronized void recordTrackingHwFilterNotAvailableCountMetrics() {

        MetricsLogger.getInstance()

                .cacheCount(

                        BluetoothProtoEnums.LE_SCAN_ABUSE_COUNT_TRACKING_HW_FILTER_NOT_AVAILABLE,

                        1);

    }



    static void initScanRadioState() {

        synchronized (sLock) {

            sIsRadioStarted = false;

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

+6 −1
Original line number Diff line number Diff line
@@ -1517,6 +1517,7 @@ public class ScanManager { 
                        if (!manageAllocationOfTrackingAdvertisement(trackEntries, true)) {

                            Log.e(TAG, "No hardware resources for onfound/onlost filter "

                                    + trackEntries);

                            client.stats.recordTrackingHwFilterNotAvailableCountMetrics();

                            try {

                                mService.onScanManagerErrorCallback(scannerId,

                                        ScanCallback.SCAN_FAILED_INTERNAL_ERROR);
@@ -1614,7 +1615,11 @@ public class ScanManager { 
            if (client.filters == null || client.filters.isEmpty()) {

                return true;

            }

            return client.filters.size() > mFilterIndexStack.size();

            if (client.filters.size() > mFilterIndexStack.size()) {

                client.stats.recordHwFilterNotAvailableCountMetrics();

                return true;

            }

            return false;

        }



        private void initFilterIndexStack() {