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

Commit af8eb2d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate bluetooth imports to proto_logging" am: f8567ab8 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1508752

Change-Id: Idba2fec2e521ce22bb675b6f8db0c1034fd43fa9
parents ad67d769 f8567ab8

system/btif/src/btif_sock.cc

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <base/logging.h>



#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>

#include <hardware/bluetooth.h>

#include <hardware/bt_sock.h>

system/btif/src/btif_sock_rfc.cc

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


#include <mutex>



#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>

#include <hardware/bluetooth.h>

#include <hardware/bt_sock.h>

system/common/metrics.h

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 


#pragma once



#include <android/bluetooth/hci/enums.pb.h>

#include <bta/include/bta_api.h>

#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>

#include <stdint.h>

#include <memory>

#include <string>

system/hci/src/hci_layer.cc

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <base/run_loop.h>

#include <base/sequenced_task_runner.h>

#include <base/threading/thread.h>

#include <frameworks/base/core/proto/android/bluetooth/hci/enums.pb.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>



#include <signal.h>

#include <string.h>

system/stack/acl/btm_ble_connection_establishment.cc

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
 *

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



#include <frameworks/base/core/proto/android/bluetooth/enums.pb.h>

#include <frameworks/base/core/proto/android/bluetooth/hci/enums.pb.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>



#include "bt_types.h"

#include "btm_int.h"