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

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

Merge "clang-format: audio-hal-interface" am: b07d6b6a am: 66d075f2 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1940867

Change-Id: I7ad7bafcb51d874477ac87faa2ea2915cf8e6640
parents 9da502c5 66d075f2

system/audio_hal_interface/a2dp_encoding.cc

+2 −1
Original line number Diff line number Diff line
@@ -318,7 +318,8 @@ bool a2dp_get_selected_hal_pcm_config(PcmParameters* pcm_config) { 
// Checking if new bluetooth_audio is supported

bool is_hal_2_0_force_disabled() {

  if (!is_configured) {

    btaudio_a2dp_disabled = osi_property_get_bool(BLUETOOTH_AUDIO_HAL_PROP_DISABLED, false);

    btaudio_a2dp_disabled =

        osi_property_get_bool(BLUETOOTH_AUDIO_HAL_PROP_DISABLED, false);

    is_configured = true;

  }

  return btaudio_a2dp_disabled;

system/audio_hal_interface/a2dp_encoding_host.cc

+1 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include "a2dp_encoding_host.h"



#include <base/logging.h>

#include <errno.h>

#include <grp.h>

#include <sys/stat.h>
@@ -33,8 +34,6 @@ 
#include "types/raw_address.h"

#include "udrv/include/uipc.h"



#include <base/logging.h>



#define A2DP_DATA_READ_POLL_MS 10

#define A2DP_HOST_DATA_PATH "/var/run/bluetooth/audio/.a2dp_data"

// TODO(b/198260375): Make A2DP data owner group configurable.

system/audio_hal_interface/client_interface.h

+6 −5
Original line number Diff line number Diff line
@@ -16,18 +16,19 @@ 


#pragma once



#include <time.h>

#include <mutex>

#include <vector>



#include <android/hardware/bluetooth/audio/2.2/IBluetoothAudioProvider.h>

#include <android/hardware/bluetooth/audio/2.2/types.h>

#include <fmq/MessageQueue.h>

#include <hardware/audio.h>

#include <time.h>



#include <mutex>

#include <vector>



#include "common/message_loop_thread.h"



#define BLUETOOTH_AUDIO_HAL_PROP_DISABLED "persist.bluetooth.bluetooth_audio_hal.disabled"

#define BLUETOOTH_AUDIO_HAL_PROP_DISABLED \

  "persist.bluetooth.bluetooth_audio_hal.disabled"



namespace bluetooth {

namespace audio {

system/audio_hal_interface/client_interface_unittest.cc

+2 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 


#define LOG_TAG "bluetooth"



#include "client_interface.h"



#include <gtest/gtest.h>



#include "client_interface.h"

#include "codec_status.h"



namespace {

system/audio_hal_interface/codec_status.cc

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#define LOG_TAG "bluetooth"



#include "codec_status.h"

#include "client_interface.h"



#include "a2dp_aac_constants.h"

#include "a2dp_sbc_constants.h"
@@ -25,6 +24,7 @@ 
#include "a2dp_vendor_aptx_hd_constants.h"

#include "a2dp_vendor_ldac_constants.h"

#include "bta/av/bta_av_int.h"

#include "client_interface.h"



namespace {