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

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

Merge "Add scan mode information to log when upgrading and reverting scan... 

Merge "Add scan mode information to log when upgrading and reverting scan mode" into main am: 58e8d862

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



Change-Id: I7a62c653f92e902c51a1650a9556c26073fa250a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c336ad43 58e8d862

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

+12 −2
Original line number Diff line number Diff line
@@ -782,7 +782,12 @@ public class ScanManager { 
            if (upgradeScanModeByOneLevel(client)) {

                Message msg = obtainMessage(MSG_REVERT_SCAN_MODE_UPGRADE);

                msg.obj = client;

                Log.d(TAG, "scanMode is upgraded for " + client);

                Log.d(

                        TAG,

                        "scanMode is upgraded to "

                                + getScanModeString(client.settings.getScanMode())

                                + " for "

                                + client);

                sendMessageDelayed(msg, mAdapterService.getScanUpgradeDurationMillis());

                return true;

            }
@@ -809,7 +814,12 @@ public class ScanManager { 
                return;

            }

            if (client.updateScanMode(client.scanModeApp)) {

                Log.d(TAG, "scanMode upgrade is reverted for " + client);

                Log.d(

                        TAG,

                        "scanMode upgrade is reverted to "

                                + getScanModeString(client.scanModeApp)

                                + " for "

                                + client);

                mScanNative.configureRegularScanParams();

            }

        }