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

Commit 84d7422c authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge "Add INIT_gd_rust flag" am: aea7098d am: f9696668 am: 58dafc3f 

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

Change-Id: I976b6b25f2f9b6f9df950e6464be0a8df32d5397
parents 598ce239 58dafc3f

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -3104,6 +3104,7 @@ public class AdapterService extends Service { 
    private static final String GD_CONTROLLER_FLAG = "INIT_gd_controller";

    private static final String GD_CONTROLLER_FLAG = "INIT_gd_controller";

    private static final String GD_ACL_FLAG = "INIT_gd_acl";

    private static final String GD_ACL_FLAG = "INIT_gd_acl";

    private static final String GD_L2CAP_FLAG = "INIT_gd_l2cap";

    private static final String GD_L2CAP_FLAG = "INIT_gd_l2cap";

    private static final String GD_RUST_FLAG = "INIT_gd_rust";

    /**

    /**

     * Logging flags logic (only applies to DEBUG and VERBOSE levels):

     * Logging flags logic (only applies to DEBUG and VERBOSE levels):

     * if LOG_TAG in LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG:

     * if LOG_TAG in LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG:
@@ -3145,6 +3146,9 @@ public class AdapterService extends Service { 
        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_L2CAP_FLAG, false)) {

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

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

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

        }

        }

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

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

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, false)) {

                LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, false)) {

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

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