diff options
| author | 2024-12-09 10:39:44 -0800 | |
|---|---|---|
| committer | 2024-12-10 18:02:59 +0000 | |
| commit | 48cd179a09e379ab2b8cf1e90807d3ed76a80a3d (patch) | |
| tree | 87fa15219975e43c7ea886e8bbaa91414e3b7720 | |
| parent | 65891baee78538a372713245fbc1546b8ccea747 (diff) | |
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
| -rw-r--r-- | flags/Android.bp | 1 | ||||
| -rw-r--r-- | flags/BUILD.gn | 1 | ||||
| -rw-r--r-- | flags/asha.aconfig | 12 | ||||
| -rw-r--r-- | system/bta/hearing_aid/hearing_aid.cc | 4 |
4 files changed, 1 insertions, 17 deletions
diff --git a/flags/Android.bp b/flags/Android.bp index 63f4903b18..cb8dd2d0e3 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -13,7 +13,6 @@ aconfig_declarations { "a2dp.aconfig", "active_device_manager.aconfig", "adapter.aconfig", - "asha.aconfig", "avrcp.aconfig", "avrcp_controller.aconfig", "bta_dm.aconfig", diff --git a/flags/BUILD.gn b/flags/BUILD.gn index 773f237870..efc3675c1a 100644 --- a/flags/BUILD.gn +++ b/flags/BUILD.gn @@ -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", diff --git a/flags/asha.aconfig b/flags/asha.aconfig deleted file mode 100644 index ec130c0cfd..0000000000 --- a/flags/asha.aconfig +++ /dev/null @@ -1,12 +0,0 @@ -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 - } -} diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc index e27b420c8e..2b876c5860 100644 --- a/system/bta/hearing_aid/hearing_aid.cc +++ b/system/bta/hearing_aid/hearing_aid.cc @@ -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) { |