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

Commit 5cce7149 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Jakub Pawłowski
Browse files

Move device search to separate file 

This source should be separate from service discovery

Bug: 330675788
Bug: 335732980
Flag: com.android.bluetooth.flags.separate_service_and_device_discovery
Test: mma -j32
Change-Id: I04d55fd1f854164b895b1beadbfd5f0361f32a1e
parent e092babd

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"