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

Commit 79fefe05 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Retrieve the background scan mode from Settings.Global."

parents 70726f83 e7ca0428
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -1340,12 +1340,17 @@ public class ScanManager {
                }
            }
        } else {
            ContentResolver resolver = mService.getContentResolver();
            int backgroundScanMode = Settings.Global.getInt(
                    resolver,
                    Settings.Global.BLE_SCAN_BACKGROUND_MODE,
                    ScanSettings.SCAN_MODE_LOW_POWER);
            for (ScanClient client : mRegularScanClients) {
                if (client.appUid == uid && !mScanNative.isOpportunisticScanClient(client)) {
                    client.passiveSettings = client.settings;
                    ScanSettings.Builder builder = new ScanSettings.Builder();
                    ScanSettings settings = client.settings;
                    builder.setScanMode(ScanSettings.SCAN_MODE_LOW_POWER);
                    builder.setScanMode(backgroundScanMode);
                    builder.setCallbackType(settings.getCallbackType());
                    builder.setScanResultType(settings.getScanResultType());
                    builder.setReportDelay(settings.getReportDelayMillis());