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

Commit 159065ea authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Reduce logspam for background scans" am: 38f103e2 am: 17dcff6b am:... 

Merge "Reduce logspam for background scans" am: 38f103e2 am: 17dcff6b am: 1c6db52f am: bcd9147d

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

Change-Id: I0cf67530569bc790f1967eb2e369ba8c6f6839aa
parents da1b4bde bcd9147d

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

+13 −5
Original line number Diff line number Diff line
@@ -1776,7 +1776,9 @@ public class GattService extends ProfileService { 
        for (ScanClient client : mScanManager.getRegularScanQueue()) {

            ScannerMap.App app = mScannerMap.getById(client.scannerId);

            if (app == null) {

                Log.i(TAG, "App is null; skip.");

                if (VDBG) {

                    Log.d(TAG, "App is null; skip.");

                }

                continue;

            }
@@ -1788,7 +1790,9 @@ public class GattService extends ProfileService { 
            if (settings.getLegacy()) {

                if ((eventType & ET_LEGACY_MASK) == 0) {

                    // If this is legacy scan, but nonlegacy result - skip.

                    Log.i(TAG, "Legacy scan, non legacy result; skip.");

                    if (VDBG) {

                        Log.d(TAG, "Legacy scan, non legacy result; skip.");

                    }

                    continue;

                } else {

                    // Some apps are used to fixed-size advertise data.
@@ -1829,8 +1833,10 @@ public class GattService extends ProfileService { 
            }

            MatchResult matchResult = matchesFilters(client, result, originalAddress);

            if (!hasPermission || !matchResult.getMatches()) {

                Log.i(TAG, "Skipping client: permission="

                if (VDBG) {

                    Log.d(TAG, "Skipping client: permission="

                            + hasPermission + " matches=" + matchResult.getMatches());

                }

                continue;

            }
@@ -1842,7 +1848,9 @@ public class GattService extends ProfileService { 
            }



            if ((settings.getCallbackType() & ScanSettings.CALLBACK_TYPE_ALL_MATCHES) == 0) {

                Log.i(TAG, "Skipping client: CALLBACK_TYPE_ALL_MATCHES");

                if (VDBG) {

                    Log.d(TAG, "Skipping client: CALLBACK_TYPE_ALL_MATCHES");

                }

                continue;

            }