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

Commit 48cd179a authored by Henri Chataing's avatar Henri Chataing
Browse files

Flags 24Q4: Remove the flag asha_encrypted_l2c_coc 

Bug: 348505552
Test: m com.android.btservices
Flag: com.android.bluetooth.flags.asha_encrypted_l2c_coc
Change-Id: Id3e71ecfdf0876c8082847f59f44d1b22467012a
parent 65891bae

flags/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ aconfig_declarations { 
        "a2dp.aconfig",

        "active_device_manager.aconfig",

        "adapter.aconfig",

        "asha.aconfig",

        "avrcp.aconfig",

        "avrcp_controller.aconfig",

        "bta_dm.aconfig",

flags/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ aconfig("bluetooth_flags_c_lib") { 
    "a2dp.aconfig",

    "active_device_manager.aconfig",

    "adapter.aconfig",

    "asha.aconfig",

    "avrcp.aconfig",

    "avrcp_controller.aconfig",

    "bta_dm.aconfig",

flags/asha.aconfig

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "asha_encrypted_l2c_coc"

    namespace: "bluetooth"

    description: "Request encryption in LE CoC channel creation"

    bug: "348505552"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

system/bta/hearing_aid/hearing_aid.cc

+1 −3
Original line number Diff line number Diff line
@@ -1070,9 +1070,7 @@ public: 
            /// The L2CAP will automatically reconnect the LE-ACL link on

            /// disconnection when there is a pending channel request,

            /// which invalidates all encryption checks performed here.

            com::android::bluetooth::flags::asha_encrypted_l2c_coc()

                    ? BTM_SEC_IN_ENCRYPT | BTM_SEC_OUT_ENCRYPT

                    : BTM_SEC_NONE,

            BTM_SEC_IN_ENCRYPT | BTM_SEC_OUT_ENCRYPT,

            HearingAidImpl::GapCallbackStatic, BT_TRANSPORT_LE);



    if (gap_handle == GAP_INVALID_HANDLE) {