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

Commit a2a983f5 authored by Chris Manton's avatar Chris Manton
Browse files

Add INIT_sdp_skip_rnr_if_known init flag 

Bug: 260598196
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Ignore-AOSP-First: Cherry-pick - flags reworked

Merged-In: I659014fb09f98fdb7ec58d9cadec227be9062881
Change-Id: Id805d77ddf42e9082e88897eef1970a3c2b68574
parent ae1ade5f

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

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



    // Boolean flags

    private static final String SDP_SKIP_RNR_IF_KNOWN = "INIT_sdp_skip_rnr_if_known";

    private static final String SDP_SERIALIZATION_FLAG = "INIT_sdp_serialization";

    private static final String GD_CORE_FLAG = "INIT_gd_core";

    private static final String GD_ADVERTISING_FLAG = "INIT_gd_advertising";
@@ -5207,6 +5208,10 @@ public class AdapterService extends Service { 
        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_CORE_FLAG, false)) {

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

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                    SDP_SKIP_RNR_IF_KNOWN, true)) {

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

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                    SDP_SERIALIZATION_FLAG, true)) {

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