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

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

Merge "Add GD advertising init flags" am: 7397e3b9 am: 5019c313 am:... 

Merge "Add GD advertising init flags" am: 7397e3b9 am: 5019c313 am: 416ec959 am: c74f59d9 am: 2f547f70

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

Change-Id: Ia98a92457279118c1eddb64859d757e9f50b1cd0
parents e5c4f78e 2f547f70

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

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



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

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

            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)) {

            initFlags.add(GD_HCI_FLAG);

        }