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

Commit 465b99cc authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-3316623-revert-3315276-VNGBAEHITV-PBHMDRFFFA"... 

Merge changes from topic "revert-3316623-revert-3315276-VNGBAEHITV-PBHMDRFFFA" into main am: 85f00011

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



Change-Id: I616ae4bef85d11f866ad6d213d51ad81ec027aeb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba8f3ff3 85f00011

TEST_MAPPING

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
      "name": "net_test_device_iot_config"

    },

    {

      "name": "net_test_gatt_conn_multiplexing"

      "name": "net_test_conn_multiplexing"

    },

    {

      "name": "net_test_hci"
@@ -251,7 +251,7 @@ 
      "name": "net_test_device_iot_config"

    },

    {

      "name": "net_test_gatt_conn_multiplexing"

      "name": "net_test_conn_multiplexing"

    },

    {

      "name": "net_test_stack"

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ cc_test { 
        ":TestMockStackAvdt",

        ":TestMockStackAvrc",

        ":TestMockStackBtm",

        ":TestMockStackConnMgr",

        ":TestMockStackGap",

        ":TestMockStackGatt",

        ":TestMockStackHid",

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include "main/shim/entry.h"

#include "osi/include/allocator.h"

#include "osi/include/properties.h"

#include "stack/gatt/connection_manager.h"

#include "stack/connection_manager/connection_manager.h"

#include "stack/include/acl_api.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

system/btif/src/bluetooth.cc

+1 −1
Original line number Diff line number Diff line
@@ -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/gatt/connection_manager.h"

#include "stack/connection_manager/connection_manager.h"

#include "stack/include/a2dp_api.h"

#include "stack/include/avct_api.h"

#include "stack/include/avdt_api.h"

system/stack/Android.bp

+9 −6
Original line number Diff line number Diff line
@@ -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,6 +540,7 @@ cc_fuzz { 
        ":TestMockStackAcl",

        ":TestMockStackArbiter",

        ":TestMockStackBtm",

        ":TestMockStackConnMgr",

        ":TestMockStackHcic",

        ":TestMockStackL2cap",

        ":TestMockStackMetrics",
@@ -1067,7 +1068,7 @@ cc_test { 


// Bluetooth stack connection multiplexing

cc_test {

    name: "net_test_gatt_conn_multiplexing",

    name: "net_test_conn_multiplexing",

    defaults: [

        "fluoride_defaults",

        "mts_defaults",
@@ -1086,9 +1087,9 @@ cc_test { 
    srcs: [

        ":TestCommonMainHandler",

        ":TestMockStackBtmInterface",

        "gatt/connection_manager.cc",

        "connection_manager/connection_manager.cc",

        "test/common/mock_btm_api_layer.cc",

        "test/gatt_connection_manager_test.cc",

        "test/connection_manager_test.cc",

    ],

    shared_libs: [

        "libcutils",
@@ -1722,6 +1723,7 @@ cc_test { 
        ":TestMockMainShimEntry",

        ":TestMockRustFfi",

        ":TestMockStackBtu",

        ":TestMockStackConnMgr",

        ":TestMockStackGap",

        ":TestMockStackGatt",

        ":TestMockStackHcic",
@@ -2042,9 +2044,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",
@@ -2137,7 +2139,7 @@ cc_test { 
        ":TestMockMainShimEntry",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackGatt",

        ":TestMockStackConnMgr",

        ":TestMockStackHcic",

        ":TestMockStackSdp",

        ":TestMockStackSmp",
@@ -2234,6 +2236,7 @@ cc_test { 
        ":TestMockRustFfi",

        ":TestMockStackBtm",

        ":TestMockStackBtu",

        ":TestMockStackConnMgr",

        ":TestMockStackGatt",

        ":TestMockStackHcic",

        ":TestMockStackL2cap",