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

Commit 5514c413 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

gatt_utils_white_list -> connection_manager am: 22d721e7 

am: 5c03b559

Change-Id: Ic5596a7126024ce6c6c37f3753f83f6acc1974a5
parents 490043ec 5c03b559

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "sdp_api.h"

#include "stack/gatt/gatt_utils_white_list.h"

#include "stack/gatt/connection_manager.h"

#include "utl.h"



#if (GAP_INCLUDED == TRUE)

system/stack/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ cc_library_static { 
        "gap/gap_ble.cc",

        "gap/gap_conn.cc",

        "gatt/att_protocol.cc",

        "gatt/connection_manager.cc",

        "gatt/gatt_api.cc",

        "gatt/gatt_attr.cc",

        "gatt/gatt_auth.cc",
@@ -124,7 +125,6 @@ cc_library_static { 
        "gatt/gatt_main.cc",

        "gatt/gatt_sr.cc",

        "gatt/gatt_utils.cc",

        "gatt/gatt_utils_white_list.cc",

        "hcic/hciblecmds.cc",

        "hcic/hcicmds.cc",

        "hid/hidh_api.cc",

system/stack/BUILD.gn

+1 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static_library("stack") { 
    "gap/gap_ble.cc",

    "gap/gap_conn.cc",

    "gatt/att_protocol.cc",

    "gatt/connection_manager.cc",

    "gatt/gatt_api.cc",

    "gatt/gatt_attr.cc",

    "gatt/gatt_auth.cc",
@@ -108,7 +109,6 @@ static_library("stack") { 
    "gatt/gatt_main.cc",

    "gatt/gatt_sr.cc",

    "gatt/gatt_utils.cc",

    "gatt/gatt_utils_white_list.cc",

    "hcic/hciblecmds.cc",

    "hcic/hcicmds.cc",

    "hid/hidh_api.cc",

system/stack/btm/btm_devctl.cc

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include "hcimsgs.h"

#include "l2c_int.h"

#include "osi/include/osi.h"

#include "stack/gatt/gatt_utils_white_list.h"

#include "stack/gatt/connection_manager.h"



#include "gatt_int.h"

system/stack/gatt/gatt_utils_white_list.cc→system/stack/gatt/connection_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 *

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



#include "gatt_utils_white_list.h"

#include "connection_manager.h"



#include <base/logging.h>

#include <list>