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

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

Merge "Add GD hci & controller init flags" am: ea8d2eba am: dbb1d67f am: 448c9c8e 

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

Change-Id: I4ad75436f55d87364c1e169feff0ab97f3fdb2b7
parents 4ea0995d 448c9c8e

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

+8 −0
Original line number Diff line number Diff line
@@ -3054,11 +3054,19 @@ public class AdapterService extends Service { 
    }



    private static final String GD_CORE_FLAG = "INIT_gd_core";

    private static final String GD_HCI_FLAG = "INIT_gd_hci";

    private static final String GD_CONTROLLER_FLAG = "INIT_gd_controller";

    private String[] getInitFlags() {

        ArrayList<String> initFlags = new ArrayList<>();

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

            initFlags.add(GD_CORE_FLAG);

        }

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

            initFlags.add(GD_HCI_FLAG);

        }

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

            initFlags.add(GD_CONTROLLER_FLAG);

        }

        return initFlags.toArray(new String[0]);

    }