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

Commit 208279b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add GD scanning init flags" am: 9ca6c0ed 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c0435980156190bc4a1ec235780d62c77df1513
parents 41fb3721 9ca6c0ed

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+4 −0
Original line number Diff line number Diff line
@@ -3099,6 +3099,7 @@ public class AdapterService extends Service { 
    // Boolean flags

    private static final String GD_CORE_FLAG = "INIT_gd_core";

    private static final String GD_ADVERTISING_FLAG = "INIT_gd_advertising";

    private static final String GD_SCANNING_FLAG = "INIT_gd_scanning";

    private static final String GD_HCI_FLAG = "INIT_gd_hci";

    private static final String GD_CONTROLLER_FLAG = "INIT_gd_controller";

    private static final String GD_ACL_FLAG = "INIT_gd_acl";
@@ -3133,6 +3134,9 @@ public class AdapterService extends Service { 
        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_ADVERTISING_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_ADVERTISING_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_SCANNING_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_SCANNING_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_HCI_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_HCI_FLAG, "true"));

        }