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

Commit f89cfc82 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Apply clang-format to Bluetooth related HAL code"

parents 44a5e5f7 caeab05b

bluetooth/.clang-format

0 → 100644
+20 −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.

#



BasedOnStyle: Google

CommentPragmas: NOLINT:.*

DerivePointerAlignment: false

bluetooth/1.0/default/async_fd_watcher.cc

+8 −10
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 


#include "async_fd_watcher.h"



#include <log/log.h>

#include <algorithm>

#include <atomic>

#include <condition_variable>

#include <map>

#include <mutex>

#include <thread>

#include <log/log.h>

#include <vector>

#include "fcntl.h"

#include "sys/select.h"
@@ -159,11 +159,9 @@ void AsyncFdWatcher::ThreadRoutine() { 
      TimeoutCallback saved_cb;

      {

        std::unique_lock<std::mutex> guard(timeout_mutex_);

        if (timeout_ms_ > std::chrono::milliseconds(0))

          saved_cb = timeout_cb_;

        if (timeout_ms_ > std::chrono::milliseconds(0)) saved_cb = timeout_cb_;

      }

      if (saved_cb != nullptr)

        saved_cb();

      if (saved_cb != nullptr) saved_cb();

      continue;

    }

bluetooth/1.0/default/async_fd_watcher.h

+4 −5
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ class AsyncFdWatcher { 
  std::chrono::milliseconds timeout_ms_;

};





}  // namespace async

}  // namespace bluetooth

}  // namespace hardware

bluetooth/1.0/default/bluetooth_hci.h

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ namespace bluetooth { 
namespace V1_0 {

namespace implementation {



using ::android::hardware::Return;

using ::android::hardware::hidl_vec;

using ::android::hardware::Return;



class BluetoothDeathRecipient;

bluetooth/1.0/default/bt_vendor_lib.h

+6 −7
Original line number Diff line number Diff line
@@ -418,8 +418,7 @@ extern const bt_vendor_interface_t BLUETOOTH_VENDOR_LIB_INTERFACE; 
// DIRECTORIES.

// ONLY USED INSIDE transmit_cb.

// DO NOT USE IN NEW HAL IMPLEMENTATIONS GOING FORWARD

typedef struct

{

typedef struct {

  uint16_t event;

  uint16_t len;

  uint16_t offset;