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

Commit 5019c313 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add GD advertising init flags" am: 7397e3b9 

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

Change-Id: If51a5ba0ea5f35366841ffb44a10892da68905e4
parents 7589915e 7397e3b9

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -3054,6 +3054,7 @@ public class AdapterService extends Service { 
    }

    }





    private static final String GD_CORE_FLAG = "INIT_gd_core";

    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_HCI_FLAG = "INIT_gd_hci";

    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_CONTROLLER_FLAG = "INIT_gd_controller";

    private String[] getInitFlags() {

    private String[] getInitFlags() {
@@ -3061,6 +3062,9 @@ public class AdapterService extends Service { 
        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_CORE_FLAG, false)) {

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

            initFlags.add(GD_CORE_FLAG);

            initFlags.add(GD_CORE_FLAG);

        }

        }

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

            initFlags.add(GD_ADVERTISING_FLAG);

        }

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

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

            initFlags.add(GD_HCI_FLAG);

            initFlags.add(GD_HCI_FLAG);

        }

        }