commit 279940e04542f64890b16f4ad77a5b8963d39667
author Cheney Ni <cheneyni@google.com> Sun Feb 24 02:14:20 2019 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Feb 27 18:51:30 2019 +0000
tree a0fddeff8d84524afe526ef262d6ec37bf1bec37
parent 4305025fa61e229acd10296802ae57546211b8f4

BluetoothAudio HAL: flip to be enabled by default

Bug: 126304229
Test: Switch BluetoothAudio HAL and A2DP offload manully
Change-Id: I26dc39fd5d483590f7cc9ae9bd5972f90719f93a
(cherry picked from commit 0666b679da93248ede2f3cd644f86b380583b80d)

audio_hal_interface/a2dp_encoding.cc

diff --git a/audio_hal_interface/a2dp_encoding.cc b/audio_hal_interface/a2dp_encoding.cc
index 8c733c7..bdb46ae 100644
--- a/audio_hal_interface/a2dp_encoding.cc
+++ b/audio_hal_interface/a2dp_encoding.cc
@@ -552,8 +552,7 @@
 // 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;

audio_hal_interface/client_interface.h

diff --git a/audio_hal_interface/client_interface.h b/audio_hal_interface/client_interface.h
index 60af041..f5d21cd 100644
--- a/audio_hal_interface/client_interface.h
+++ b/audio_hal_interface/client_interface.h
@@ -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 {

audio_hal_interface/hearing_aid_software_encoding.cc

diff --git a/audio_hal_interface/hearing_aid_software_encoding.cc b/audio_hal_interface/hearing_aid_software_encoding.cc
index c141104..78871ab 100644
--- a/audio_hal_interface/hearing_aid_software_encoding.cc
+++ b/audio_hal_interface/hearing_aid_software_encoding.cc
@@ -142,8 +142,7 @@
 
 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;