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

Commit de95de35 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Gerrit Code Review
Browse files

Merge changes I04d55fd1,I5e7f88e8,Idfc3ded8 into main 

* changes:
  Move device search to separate file
  Separate search and discovery control blocks
  Get rid of on_name_read discovery callback
parents 831ee4ea 5cce7149

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ filegroup { 
        "dm/bta_dm_api.cc",

        "dm/bta_dm_cfg.cc",

        "dm/bta_dm_ci.cc",

        "dm/bta_dm_device_search.cc",

        "dm/bta_dm_disc.cc",

        "dm/bta_dm_disc_legacy.cc",

        "dm/bta_dm_gatt_client.cc",

system/bta/BUILD.gn

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

    "dm/bta_dm_cfg.cc",

    "dm/bta_dm_ci.cc",

    "dm/bta_dm_device_search.cc",

    "dm/bta_dm_disc.cc",

    "dm/bta_dm_disc_legacy.cc",

    "dm/bta_dm_gatt_client.cc",

system/bta/dm/bta_dm_act.cc

+8 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <cstdint>

#include <vector>



#include "bta/dm/bta_dm_device_search.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_gatt_client.h"

#include "bta/dm/bta_dm_int.h"
@@ -222,6 +223,7 @@ void BTA_dm_on_hw_off() { 
  bta_dm_deinit_cb();



  bta_dm_disc_stop();

  bta_dm_search_stop();

}



void BTA_dm_on_hw_on() {
@@ -314,7 +316,12 @@ void bta_dm_disable() { 
  BTM_SetConnectability(BTM_NON_CONNECTABLE);



  bta_dm_disable_pm();

  if (IS_FLAG_ENABLED(separate_service_and_device_discovery)) {

    bta_dm_disc_disable_search();

    bta_dm_disc_disable_disc();

  } else {

    bta_dm_disc_disable_search_and_disc();

  }

  bta_dm_cb.disabling = true;



  connection_manager::reset(false);

system/bta/dm/bta_dm_api.cc

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


#include <vector>



#include "bta/dm/bta_dm_device_search.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_int.h"

#include "bta/dm/bta_dm_sec_int.h"

system/bta/dm/bta_dm_device_search.cc

0 → 100644
+1060 −0

File added.

Preview size limit exceeded, changes collapsed.