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

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

Merge "Add GD hci & controller init flags" am: 33841a7c am: 785a7167

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

Change-Id: Ida28d6a280282509dbff5ba61e3ae62347196e3b
parents 2c31b106 785a7167
Loading
Loading
Loading
Loading
+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]);
    }