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

Commit e6b9e22e 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 am: c0a98e7a

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



Change-Id: I342119443be85387213793a26e15cb939a74b2b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2404f1bb c0a98e7a

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();

            }

        }