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

Commit 824add1f authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "IA2: Separate out bta::dm:bta_dm_sec" into main am: 2295b6e0 

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



Change-Id: Ic50024eca524f8ae1c822a7333ddd0dc7aac247e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7affe200 2295b6e0

system/bta/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ filegroup { 
        "dm/bta_dm_gatt_client.cc",

        "dm/bta_dm_main.cc",

        "dm/bta_dm_pm.cc",

        "dm/bta_dm_sec.cc",

    ],

}
@@ -412,6 +413,7 @@ cc_test { 
        "test/bta_hf_client_add_record_test.cc",

        "test/bta_pan_test.cc",

        "test/bta_sdp_test.cc",

        "test/bta_sec_test.cc",

    ],

    shared_libs: [

        "libbase",

system/bta/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static_library("bta") { 
    "dm/bta_dm_gatt_client.cc",

    "dm/bta_dm_main.cc",

    "dm/bta_dm_pm.cc",

    "dm/bta_dm_sec.cc",

    "gatt/bta_gattc_act.cc",

    "gatt/bta_gattc_api.cc",

    "gatt/bta_gattc_db_storage.cc",

system/bta/dm/bta_dm_act.cc

+13 −1080

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/dm/bta_dm_act.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include "bta/dm/bta_dm_int.h"

#include "osi/include/osi.h"

#include "types/bt_transport.h"

#include "types/raw_address.h"



void bta_dm_process_remove_device_no_callback(const RawAddress& bd_addr);



tBTA_DM_PEER_DEVICE* find_connected_device(const RawAddress& bd_addr,

                                           UNUSED_ATTR tBT_TRANSPORT transport);

system/bta/dm/bta_dm_api.cc

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "bt_target.h"  // Must be first to define build configuration

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_int.h"

#include "bta/dm/bta_dm_sec.h"

#include "osi/include/allocator.h"

#include "osi/include/compat.h"

#include "stack/btm/btm_sec.h"