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

Commit ce7714ba authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge changes Ibad55782,I55c60f4a,Ia3230e88,I71d0af48 into main 

* changes:
  [Invisalign2] cleanup the logic in BTA_dm_on_hw_on
  [Invisalign2] Separate security apis from bta_api.h
  [Invisalign2] Seperate bta security APIs from bta_dm_api.cc
  [Invisalign2] Rename bta_dm_sec.h to bta_dm_sec_int.h
parents f42ac9cb 99a072e3

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ filegroup { 
    srcs: [

        "dm/bta_dm_act.cc",

        "dm/bta_dm_api.cc",

        "dm/bta_dm_sec_api.cc",

        "dm/bta_dm_cfg.cc",

        "dm/bta_dm_ci.cc",

        "dm/bta_dm_disc.cc",

system/bta/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static_library("bta") { 
    "csis/csis_client.cc",

    "dm/bta_dm_act.cc",

    "dm/bta_dm_api.cc",

    "dm/bta_dm_sec_api.cc",

    "dm/bta_dm_cfg.cc",

    "dm/bta_dm_ci.cc",

    "dm/bta_dm_disc.cc",

system/bta/ag/bta_ag_rfc.cc

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <cstring>



#include "bta/ag/bta_ag_int.h"

#include "bta/include/bta_sec_api.h"

#include "osi/include/osi.h"

#include "stack/include/main_thread.h"

#include "stack/include/port_api.h"

system/bta/av/bta_av_int.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <string>



#include "bta/include/bta_av_api.h"

#include "bta/include/bta_sec_api.h"

#include "bta/sys/bta_sys.h"

#include "include/hardware/bt_av.h"

#include "osi/include/list.h"

system/bta/csis/csis_client.cc

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include "advertise_data_parser.h"

#include "bta_api.h"

#include "bta_sec_api.h"

#include "bta_csis_api.h"

#include "bta_gatt_api.h"

#include "bta_gatt_queue.h"