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

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

Merge changes Ie4f783b0,I456a18c6,I8c57dd5a 

am: e41294ac

Change-Id: I4d7b6140e50db7acbcc782c2a985cd5acaec7d9f
parents 90a7e205 e41294ac

system/bta/dm/bta_dm_act.cc

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +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 "utl.h"



#if (GAP_INCLUDED == TRUE)

system/stack/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ 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 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 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_ble_bgconn.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 *  Copyright 2018 The Android Open Source Project

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

 *  You may obtain a copy of the License at:

 *

 *  http://www.apache.org/licenses/LICENSE-2.0

 *

 *  Unless required by applicable law or agreed to in writing, software

 *  distributed under the License is distributed on an "AS IS" BASIS,

 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

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



#include "types/raw_address.h"



/** Set BLE connectable mode to auto connect */

extern void BTM_BleStartAutoConn();



/** Adds the device into white list. Returns false if white list is full and

 * device can't be added, true otherwise. */

extern bool BTM_WhiteListAdd(const RawAddress& address);



/** Removes the device from white list */

extern void BTM_WhiteListRemove(const RawAddress& address);



/** Clear the whitelist, end any pending whitelist connections */

extern void BTM_WhiteListClear();

system/stack/btm/btm_devctl.cc

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

#include "l2c_int.h"

#include "osi/include/osi.h"

#include "stack/gatt/gatt_utils_white_list.h"



#include "gatt_int.h"