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

Commit 72c11254 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

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



Change-Id: Ie9fa79efbf9d88cf0310ea4563a5f3656e85aa1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc95376e 63d6a626

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

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

            if ((client.stats == null) || mAdapterService.getScanDowngradeDurationMillis() == 0) {

                return false;

                return false;

            }

            }

            int scanMode = client.settings.getScanMode();

            int updatedScanMode =

            int maxScanMode = SCAN_MODE_MAX_IN_CONCURRENCY;

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

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

            if (client.updateScanMode(updatedScanMode)) {

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

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

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

                Log.d(

                        TAG,

                        "downgradeScanModeFromMaxDuty() to "

                                + getScanModeString(updatedScanMode)

                                + " for "

                                + client);

                return true;

                return true;

            }

            }

            return false;

            return false;