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

Commit 7e6b6297 authored by slki.shin's avatar slki.shin Committed by android-build-merger
Browse files

Merge "Minor: clang-format for bta_dm_act.cc" 

am: 805c13fd

Change-Id: I70efad52db0f57e202c169d2561109304f5a028a
parents e55e480b 805c13fd

system/bta/dm/bta_dm_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "btm_api.h"

#include "btm_int.h"

#include "btu.h"

#include "device/include/interop.h"

#include "gap_api.h" /* For GAP_BleReadPeerPrefConnParams */

#include "l2c_api.h"

#include "osi/include/log.h"
@@ -50,7 +51,6 @@ 
#include "stack/gatt/connection_manager.h"

#include "stack/include/gatt_api.h"

#include "utl.h"

#include "device/include/interop.h"



#if (GAP_INCLUDED == TRUE)

#include "gap_api.h"
@@ -1774,7 +1774,6 @@ void bta_dm_search_cancel_notify(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
 *

 ******************************************************************************/

static void bta_dm_find_services(const RawAddress& bd_addr) {



  while (bta_dm_search_cb.service_index < BTA_MAX_SERVICE_ID) {

    Uuid uuid = Uuid::kEmpty;

    if (bta_dm_search_cb.services_to_search &
@@ -1953,7 +1952,8 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
        BT_DEVICE_TYPE_BLE) &&

       (bta_dm_search_cb.state == BTA_DM_SEARCH_ACTIVE)) ||

      (transport == BT_TRANSPORT_LE &&

       interop_match_addr(INTEROP_DISABLE_NAME_REQUEST, &bta_dm_search_cb.peer_bdaddr))) {

       interop_match_addr(INTEROP_DISABLE_NAME_REQUEST,

                          &bta_dm_search_cb.peer_bdaddr))) {

    /* Do not perform RNR for LE devices at inquiry complete*/

    bta_dm_search_cb.name_discover_done = true;

  }