Revert "Make it obvious that connection_manager is separate from..."

Revert submission 3315276

Reason for revert: <DroidMonitor created revert due to b/375303134. Will be evrified through ABTD for standard investigation.>

Reverted changes: /q/submissionid:3315276

Change-Id: I45ab232a73179ec379aa658ec0b2d2466b0a8d20

18 files changed, 19 insertions, 37 deletions

diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 64c44d250c..235246605f 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -260,7 +260,6 @@ cc_test {
         ":TestMockStackAvdt",
         ":TestMockStackAvrc",
         ":TestMockStackBtm",
-        ":TestMockStackConnMgr",
         ":TestMockStackGap",
         ":TestMockStackGatt",
         ":TestMockStackHid",
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 792aa44b6e..1d1d5c589d 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -52,7 +52,7 @@
 #include "main/shim/entry.h"
 #include "osi/include/allocator.h"
 #include "osi/include/properties.h"
-#include "stack/connection_manager/connection_manager.h"
+#include "stack/gatt/connection_manager.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/bt_types.h"
diff --git a/system/btif/src/bluetooth.cc b/system/btif/src/bluetooth.cc
index a5a2e54f20..f246ca1be8 100644
--- a/system/btif/src/bluetooth.cc
+++ b/system/btif/src/bluetooth.cc
@@ -100,7 +100,7 @@
 #include "osi/include/wakelock.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_sco_hfp_hal.h"
-#include "stack/connection_manager/connection_manager.h"
+#include "stack/gatt/connection_manager.h"
 #include "stack/include/a2dp_api.h"
 #include "stack/include/avdt_api.h"
 #include "stack/include/btm_client_interface.h"
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 1161cae7ca..5fec9d2cee 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -275,11 +275,11 @@ cc_library_static {
         "btm/security_event_parser.cc",
         "btu/btu_event.cc",
         "btu/btu_hcif.cc",
-        "connection_manager/connection_manager.cc",
         "eatt/eatt.cc",
         "gap/gap_ble.cc",
         "gap/gap_conn.cc",
         "gatt/att_protocol.cc",
+        "gatt/connection_manager.cc",
         "gatt/gatt_api.cc",
         "gatt/gatt_attr.cc",
         "gatt/gatt_auth.cc",
@@ -540,7 +540,6 @@ cc_fuzz {
         ":TestMockStackAcl",
         ":TestMockStackArbiter",
         ":TestMockStackBtm",
-        ":TestMockStackConnMgr",
         ":TestMockStackHcic",
         ":TestMockStackL2cap",
         ":TestMockStackMetrics",
@@ -1068,7 +1067,7 @@ cc_test {
 
 // Bluetooth stack connection multiplexing
 cc_test {
-    name: "net_test_conn_multiplexing",
+    name: "net_test_gatt_conn_multiplexing",
     defaults: [
         "fluoride_defaults",
         "mts_defaults",
@@ -1087,9 +1086,9 @@ cc_test {
     srcs: [
         ":TestCommonMainHandler",
         ":TestMockStackBtmInterface",
-        "connection_manager/connection_manager.cc",
+        "gatt/connection_manager.cc",
         "test/common/mock_btm_api_layer.cc",
-        "test/connection_manager_test.cc",
+        "test/gatt_connection_manager_test.cc",
     ],
     shared_libs: [
         "libcutils",
@@ -1653,7 +1652,6 @@ cc_test {
         ":TestMockMainShimEntry",
         ":TestMockRustFfi",
         ":TestMockStackBtu",
-        ":TestMockStackConnMgr",
         ":TestMockStackGap",
         ":TestMockStackGatt",
         ":TestMockStackHcic",
@@ -1974,9 +1972,9 @@ cc_test {
         ":TestMockStackSmp",
         "ais/ais_ble.cc",
         "arbiter/acl_arbiter.cc",
-        "connection_manager/connection_manager.cc",
         "eatt/eatt.cc",
         "gatt/att_protocol.cc",
+        "gatt/connection_manager.cc",
         "gatt/gatt_api.cc",
         "gatt/gatt_attr.cc",
         "gatt/gatt_auth.cc",
@@ -2069,7 +2067,7 @@ cc_test {
         ":TestMockMainShimEntry",
         ":TestMockStackAcl",
         ":TestMockStackBtm",
-        ":TestMockStackConnMgr",
+        ":TestMockStackGatt",
         ":TestMockStackHcic",
         ":TestMockStackSdp",
         ":TestMockStackSmp",
@@ -2166,7 +2164,6 @@ cc_test {
         ":TestMockRustFfi",
         ":TestMockStackBtm",
         ":TestMockStackBtu",
-        ":TestMockStackConnMgr",
         ":TestMockStackGatt",
         ":TestMockStackHcic",
         ":TestMockStackL2cap",
diff --git a/system/stack/BUILD.gn b/system/stack/BUILD.gn
index 559aa1f366..c2b87b44a5 100644
--- a/system/stack/BUILD.gn
+++ b/system/stack/BUILD.gn
@@ -125,7 +125,7 @@ source_set("stack") {
     "gap/gap_ble.cc",
     "gap/gap_conn.cc",
     "gatt/att_protocol.cc",
-    "connection_manager/connection_manager.cc",
+    "gatt/connection_manager.cc",
     "gatt/gatt_api.cc",
     "gatt/gatt_attr.cc",
     "gatt/gatt_auth.cc",
diff --git a/system/stack/acl/ble_acl.cc b/system/stack/acl/ble_acl.cc
index 0606716f75..1f5d5b580c 100644
--- a/system/stack/acl/ble_acl.cc
+++ b/system/stack/acl/ble_acl.cc
@@ -25,7 +25,7 @@
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_int_types.h"
 #include "stack/btm/btm_sec.h"
-#include "stack/connection_manager/connection_manager.h"
+#include "stack/gatt/connection_manager.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/btm_ble_addr.h"
 #include "stack/include/btm_ble_privacy.h"
diff --git a/system/stack/btm/btm_devctl.cc b/system/stack/btm/btm_devctl.cc
index d22fba73c7..86f4af00e4 100644
--- a/system/stack/btm/btm_devctl.cc
+++ b/system/stack/btm/btm_devctl.cc
@@ -38,7 +38,7 @@
 #include "main/shim/entry.h"
 #include "stack/btm/btm_int_types.h"
 #include "stack/btm/btm_sec.h"
-#include "stack/connection_manager/connection_manager.h"
+#include "stack/gatt/connection_manager.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/acl_api_types.h"
 #include "stack/include/bt_types.h"
diff --git a/system/stack/connection_manager/connection_manager.cc b/system/stack/gatt/connection_manager.cc
index 96278a9106..96278a9106 100644
--- a/system/stack/connection_manager/connection_manager.cc
+++ b/system/stack/gatt/connection_manager.cc
diff --git a/system/stack/connection_manager/connection_manager.h b/system/stack/gatt/connection_manager.h
index a9a5256261..a9a5256261 100644
--- a/system/stack/connection_manager/connection_manager.h
+++ b/system/stack/gatt/connection_manager.h
diff --git a/system/stack/gatt/gatt_api.cc b/system/stack/gatt/gatt_api.cc
index 7ed0fe0516..d9d7f051d9 100644
--- a/system/stack/gatt/gatt_api.cc
+++ b/system/stack/gatt/gatt_api.cc
@@ -37,7 +37,7 @@
 #include "osi/include/allocator.h"
 #include "stack/arbiter/acl_arbiter.h"
 #include "stack/btm/btm_dev.h"
-#include "stack/connection_manager/connection_manager.h"
+#include "stack/gatt/connection_manager.h"
 #include "stack/gatt/gatt_int.h"
 #include "stack/include/ais_api.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/stack/gatt/gatt_main.cc b/system/stack/gatt/gatt_main.cc
index f5591d2194..bc559a5715 100644
--- a/system/stack/gatt/gatt_main.cc
+++ b/system/stack/gatt/gatt_main.cc
@@ -28,6 +28,7 @@
 #include "btif/include/btif_dm.h"
 #include "btif/include/btif_storage.h"
 #include "btif/include/stack_manager_t.h"
+#include "connection_manager.h"
 #include "device/include/interop.h"
 #include "internal_include/bt_target.h"
 #include "internal_include/stack_config.h"
@@ -37,7 +38,6 @@
 #include "stack/arbiter/acl_arbiter.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_sec.h"
-#include "stack/connection_manager/connection_manager.h"
 #include "stack/eatt/eatt.h"
 #include "stack/gatt/gatt_int.h"
 #include "stack/include/acl_api.h"
diff --git a/system/stack/gatt/gatt_utils.cc b/system/stack/gatt/gatt_utils.cc
index d159bbd794..72083acb50 100644
--- a/system/stack/gatt/gatt_utils.cc
+++ b/system/stack/gatt/gatt_utils.cc
@@ -38,8 +38,8 @@
 #include "osi/include/properties.h"
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_sec.h"
-#include "stack/connection_manager/connection_manager.h"
 #include "stack/eatt/eatt.h"
+#include "stack/gatt/connection_manager.h"
 #include "stack/gatt/gatt_int.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/bt_psm_types.h"
diff --git a/system/stack/l2cap/l2c_ble.cc b/system/stack/l2cap/l2c_ble.cc
index fe22262b89..a00e0d17f4 100644
--- a/system/stack/l2cap/l2c_ble.cc
+++ b/system/stack/l2cap/l2c_ble.cc
@@ -44,7 +44,7 @@
 #include "stack/btm/btm_int_types.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/btm/btm_sec_int_types.h"
-#include "stack/connection_manager/connection_manager.h"
+#include "stack/gatt/connection_manager.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/bt_psm_types.h"
 #include "stack/include/bt_types.h"
diff --git a/system/stack/test/gatt/mock_gatt_utils_ref.cc b/system/stack/test/gatt/mock_gatt_utils_ref.cc
index 2f392b3e90..f79db0ac3d 100644
--- a/system/stack/test/gatt/mock_gatt_utils_ref.cc
+++ b/system/stack/test/gatt/mock_gatt_utils_ref.cc
@@ -22,7 +22,7 @@
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 
-/** stack/connection_manager/connection_manager.cc */
+/** stack/gatt/connection_manager.cc */
 namespace connection_manager {
 bool background_connect_remove(uint8_t app_id, const RawAddress& address) { return false; }
 bool direct_connect_remove(uint8_t app_id, const RawAddress& address, bool connection_timeout) {
diff --git a/system/stack/test/connection_manager_test.cc b/system/stack/test/gatt_connection_manager_test.cc
index cbb7b3ff35..afe3fcba4e 100644
--- a/system/stack/test/connection_manager_test.cc
+++ b/system/stack/test/gatt_connection_manager_test.cc
@@ -1,5 +1,3 @@
-#include "stack/connection_manager/connection_manager.h"
-
 #include <base/bind_helpers.h>
 #include <base/functional/bind.h>
 #include <base/functional/callback.h>
@@ -13,6 +11,7 @@
 #include "osi/test/alarm_mock.h"
 #include "security_device_record.h"
 #include "stack/btm/neighbor_inquiry.h"
+#include "stack/gatt/connection_manager.h"
 
 // TODO(b/369381361) Enfore -Wmissing-prototypes
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
diff --git a/system/test/Android.bp b/system/test/Android.bp
index d4a1a767eb..a78ed4e8ef 100644
--- a/system/test/Android.bp
+++ b/system/test/Android.bp
@@ -484,13 +484,6 @@ filegroup {
 }
 
 filegroup {
-    name: "TestMockStackConnMgr",
-    srcs: [
-        "mock/mock_stack_connection_manager.cc",
-    ],
-}
-
-filegroup {
     name: "TestMockStackEatt",
     srcs: [
         "mock/mock_stack_eatt*.cc",
diff --git a/system/test/headless/bt_stack_info.cc b/system/test/headless/bt_stack_info.cc
index 300dbf62b7..ad00ba5c6b 100644
--- a/system/test/headless/bt_stack_info.cc
+++ b/system/test/headless/bt_stack_info.cc
@@ -21,7 +21,7 @@
 #include "btif/include/btif_common.h"  // do_in_jni_thread
 #include "btif/include/btif_hh.h"      // DumpsysHid
 #include "main/shim/dumpsys.h"
-#include "stack/connection_manager/connection_manager.h"
+#include "stack/gatt/connection_manager.h"
 #include "stack/include/main_thread.h"
 #include "stack/include/pan_api.h"  // PAN_Dumpsys
 #include "test/headless/log.h"
diff --git a/system/test/mock/mock_stack_connection_manager.cc b/system/test/mock/mock_stack_gatt_connection_manager.cc
index 97cd160854..f0f33dddb5 100644
--- a/system/test/mock/mock_stack_connection_manager.cc
+++ b/system/test/mock/mock_stack_gatt_connection_manager.cc
@@ -21,18 +21,12 @@
 
 #include <set>
 
-#include "stack/connection_manager/connection_manager.h"
+#include "stack/gatt/connection_manager.h"
 #include "test/common/mock_functions.h"
 #include "types/raw_address.h"
 
 using namespace connection_manager;
 
-bool connection_manager::background_connect_targeted_announcement_add(
-        tAPP_ID /* app_id */, const RawAddress& /* address */) {
-  inc_func_call_count(__func__);
-  return false;
-}
-
 bool connection_manager::background_connect_add(uint8_t /* app_id */,
                                                 const RawAddress& /* address */) {
   inc_func_call_count(__func__);