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

Commit 1bfb2799 authored by Luis Hector Chavez's avatar Luis Hector Chavez Committed by Gerrit Code Review
Browse files

Merge "bt: Update libchrome APIs to r395517"

parents 13176475 f55b6b7f

system/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#include "vendor_libs/test_vendor_lib/include/dual_mode_controller.h"



#include <memory>



#include "base/files/file_util.h"

#include "base/json/json_reader.h"

#include "base/logging.h"
@@ -608,7 +610,7 @@ DualModeController::Properties::Properties(const std::string& file_name) 
  if (!base::ReadFileToString(base::FilePath(file_name), &properties_raw))

    LOG_INFO(LOG_TAG, "Error reading controller properties from file.");



  scoped_ptr<base::Value> properties_value_ptr =

  std::unique_ptr<base::Value> properties_value_ptr =

      base::JSONReader::Read(properties_raw);

  if (properties_value_ptr.get() == nullptr)

    LOG_INFO(LOG_TAG,

system/vendor_libs/test_vendor_lib/src/hci_transport.cc

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include "vendor_libs/test_vendor_lib/include/hci_transport.h"



#include "base/bind.h"

#include "base/logging.h"

#include "base/thread_task_runner_handle.h"

#include "base/threading/thread_task_runner_handle.h"



extern "C" {

#include <sys/socket.h>