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

Commit 09273e13 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Add scan mode information to log when downgrade scan mode from max... 

Merge "Add scan mode information to log when downgrade scan mode from max duty" into main am: 63d6a626 am: 72c11254

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



Change-Id: I829bdf08771e7c4ef559a25a907668d1d841d093
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61b843a1 72c11254

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

+9 −4
Original line number Diff line number Diff line
@@ -847,11 +847,16 @@ public class ScanManager { 
            if ((client.stats == null) || mAdapterService.getScanDowngradeDurationMillis() == 0) {

                return false;

            }

            int scanMode = client.settings.getScanMode();

            int maxScanMode = SCAN_MODE_MAX_IN_CONCURRENCY;

            if (client.updateScanMode(getMinScanMode(scanMode, maxScanMode))) {

            int updatedScanMode =

                    getMinScanMode(client.settings.getScanMode(), SCAN_MODE_MAX_IN_CONCURRENCY);

            if (client.updateScanMode(updatedScanMode)) {

                client.stats.setScanDowngrade(client.scannerId, true);

                Log.d(TAG, "downgradeScanModeFromMaxDuty() for " + client);

                Log.d(

                        TAG,

                        "downgradeScanModeFromMaxDuty() to "

                                + getScanModeString(updatedScanMode)

                                + " for "

                                + client);

                return true;

            }

            return false;