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

Commit 1d76966f authored by Chris Manton's avatar Chris Manton
Browse files

IA2: Re-include btif::gatt

Bug: 306463948
Test: m .

Change-Id: I41197eccc66b3abf9bac3ee99e34d045b3df5fa3
parent 3f2310ee
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -28,19 +28,13 @@

#include "btif_gatt.h"

#include <errno.h>
#include <hardware/bluetooth.h>
#include <hardware/bt_gatt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "bta_api.h"
#include "bta_gatt_api.h"
#include "btif_common.h"
#include "btif_gatt_util.h"
#include "btif_storage.h"
#include "btif_util.h"
#include "main/shim/distance_measurement_manager.h"
#include "main/shim/le_advertising_manager.h"

+3 −6
Original line number Diff line number Diff line
@@ -30,27 +30,24 @@
#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/threading/thread.h>
#include <errno.h>
#include <hardware/bluetooth.h>
#include <hardware/bt_gatt.h>

#include <string>

#include "bta/include/bta_sec_api.h"
#include "bta_api.h"
#include "bta_gatt_api.h"
#include "btif_common.h"
#include "btif_config.h"
#include "btif_dm.h"
#include "btif_gatt.h"
#include "btif_gatt_util.h"
#include "btif_storage.h"
#include "btif_util.h"
#include "device/include/controller.h"
#include "osi/include/allocator.h"
#include "osi/include/log.h"
#include "os/log.h"
#include "stack/include/acl_api.h"
#include "stack/include/acl_api_types.h"
#include "stack/include/main_thread.h"
#include "types/ble_address_with_type.h"
#include "types/bluetooth/uuid.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@
#include "osi/include/allocator.h"
#include "stack/include/bt_uuid16.h"
#include "stack/include/main_thread.h"
#include "types/ble_address_with_type.h"
#include "types/bluetooth/uuid.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
+3 −11
Original line number Diff line number Diff line
@@ -18,26 +18,18 @@

#define LOG_TAG "bt_btif_gatt"

#include "btif_gatt.h"

#include <errno.h>
#include <hardware/bluetooth.h>
#include <hardware/bt_gatt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "bta_gatt_api.h"
#include "bte_appl.h"
#include "btif_common.h"
#include "btif_dm.h"
#include "btif_gatt_util.h"
#include "btif_storage.h"
#include "btif_util.h"
#include "gatt_api.h"
#include "stack/include/btm_ble_sec_api.h"
#include "osi/include/log.h"
#include "os/log.h"
#include "osi/include/osi.h"
#include "stack/include/btm_ble_sec_api.h"
#include "types/ble_address_with_type.h"
#include "types/bluetooth/uuid.h"
#include "types/raw_address.h"

+5 −9
Original line number Diff line number Diff line
@@ -20,27 +20,23 @@

#include "btif_gatt_util.h"

#include <errno.h>
#include <hardware/bluetooth.h>
#include <hardware/bt_gatt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "bta_api.h"
#include "bta_gatt_api.h"
#include "bta_jv_api.h"
#include "btif_common.h"
#include "btif_config.h"
#include "btif_dm.h"
#include "btif_gatt.h"
#include "bta/include/bta_api_data_types.h"
#include "bta/include/bta_sec_api.h"
#include "btif_storage.h"
#include "btif_util.h"
#include "common/init_flags.h"
#include "gd/os/system_properties.h"
#include "os/log.h"
#include "osi/include/allocator.h"
#include "osi/include/osi.h"
#include "stack/btm/btm_sec.h"
#include "stack/include/acl_api.h"
#include "types/ble_address_with_type.h"
#include "types/bluetooth/uuid.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"