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

Commit 8dac835b authored by Cheney Ni's avatar Cheney Ni Committed by android-build-merger
Browse files

Merge "Reland BluetoothAudio HAL: flip to be enabled by default" 

am: a32c0b54

Change-Id: I2bb2b5e4665ad38da3704ec73fc26704d6454748
parents 22ee1612 a32c0b54

system/audio_hal_interface/a2dp_encoding.cc

+1 −2
Original line number Diff line number Diff line
@@ -552,8 +552,7 @@ namespace a2dp { 
// Checking if new bluetooth_audio is supported

bool is_hal_2_0_supported() {

  if (!is_configured) {

    btaudio_a2dp_supported =

        osi_property_get_bool(BLUETOOTH_AUDIO_PROP_ENABLED, false);

    btaudio_a2dp_supported = !osi_property_get_bool(BLUETOOTH_AUDIO_HAL_PROP_DISABLED, false);

    is_configured = true;

  }

  return btaudio_a2dp_supported;

system/audio_hal_interface/client_interface.h

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 


#include "common/message_loop_thread.h"



#define BLUETOOTH_AUDIO_PROP_ENABLED \

  "persist.bluetooth.bluetooth_audio_hal.enabled"

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



namespace bluetooth {

namespace audio {

system/audio_hal_interface/hearing_aid_software_encoding.cc

+1 −2
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ namespace hearing_aid { 


bool is_hal_2_0_supported() {

  if (!is_configured) {

    btaudio_hearing_aid_supported =

        osi_property_get_bool(BLUETOOTH_AUDIO_PROP_ENABLED, false);

    btaudio_hearing_aid_supported = !osi_property_get_bool(BLUETOOTH_AUDIO_HAL_PROP_DISABLED, false);

    is_configured = true;

  }

  return btaudio_hearing_aid_supported;