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

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

Merge "Add INIT_gd_link_policy" am: d5e32a27 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I427f0fdea963b8575f94d3b84121326237faaddd
parents 0fcfb55f d5e32a27

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

+5 −0
Original line number Diff line number Diff line
@@ -3105,6 +3105,8 @@ public class AdapterService extends Service { 
    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_RUST_FLAG = "INIT_gd_rust";

    private static final String GD_LINK_POLICY_FLAG = "INIT_gd_link_policy";



    /**

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

     * if LOG_TAG in LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG:
@@ -3152,6 +3154,9 @@ public class AdapterService extends Service { 
        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, GD_LINK_POLICY_FLAG, false)) {

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

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, false)) {

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