OSDN Git Service

Merge "HCI: Add an API for sending security commands"
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 23 Aug 2019 03:40:39 +0000 (03:40 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 23 Aug 2019 03:40:39 +0000 (03:40 +0000)
1  2 
gd/hci/hci_layer.cc
gd/hci/hci_layer.h
gd/hci/hci_layer_test.cc
gd/hci/hci_packets.pdl

Simple merge
  #include <chrono>
  #include <map>
  
 -#include "common/address.h"
 +#include "address.h"
 +#include "class_of_device.h"
  #include "common/bidi_queue.h"
  #include "common/callback.h"
 -#include "common/class_of_device.h"
  #include "hal/hci_hal.h"
  #include "hci/hci_packets.h"
+ #include "hci/le_security_interface.h"
+ #include "hci/security_interface.h"
  #include "module.h"
  #include "os/utils.h"
  
Simple merge
Simple merge