Merge "bt_target.h: Remove BTA_AG_SCO_PKT_TYPES" into main am: 685666e5 am: 4dfd1f2e

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



Change-Id: Ie5b15b4ca2750d7c479f7e839d500a97ad951158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

system/bta/ag/bta_ag_cfg.cc

@@ -41,13 +41,11 @@
 #define BTA_AG_CONN_TIMEOUT 5000
 #endif
 
-#ifndef BTA_AG_SCO_PKT_TYPES
 /* S1 packet type setting from HFP 1.5 spec */
 #define BTA_AG_SCO_PKT_TYPES /* BTM_SCO_LINK_ALL_PKT_MASK */     \
   (BTM_SCO_LINK_ONLY_MASK | ESCO_PKT_TYPES_MASK_EV3 |            \
    ESCO_PKT_TYPES_MASK_NO_3_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 | \
    ESCO_PKT_TYPES_MASK_NO_3_EV5)
-#endif
 
 #ifndef BTA_AG_BIND_INFO
 #define BTA_AG_BIND_INFO "(1)"

system/internal_include/bt_target.h

@@ -68,13 +68,6 @@
 #define BTA_AG_AT_MAX_LEN 512
 #endif
 
-#ifndef BTA_AG_SCO_PKT_TYPES
-#define BTA_AG_SCO_PKT_TYPES                                     \
-  (BTM_SCO_LINK_ONLY_MASK | ESCO_PKT_TYPES_MASK_EV3 |            \
-   ESCO_PKT_TYPES_MASK_NO_3_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 | \
-   ESCO_PKT_TYPES_MASK_NO_3_EV5)
-#endif
-
 #ifndef BTA_AV_RET_TOUT
 #define BTA_AV_RET_TOUT 15
 #endif