diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-07 10:22:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-07 10:22:08 +0000 |
| commit | 7205e3cb6e860ed6276aad9bb7070d00da033da9 (patch) | |
| tree | c2cc90e117a009d98bc540ff7730b04bea548f46 | |
| parent | b03dd4611745ceb1f4568f0e04aae73464f6b65d (diff) | |
| parent | 28da17d31cec0f2ac3c746541829d8a3fe7962fd (diff) | |
| download | media-7205e3cb6e860ed6276aad9bb7070d00da033da9.tar.gz | |
Merge "add support for le audio offload property" am: 28da17d31c
Original change: https://android-review.googlesource.com/c/platform/system/media/+/2058087
Change-Id: I7bd7ebc3cd83dd947c4c8ae601a3010dd2782db2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | audio/include/system/audio_config.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/audio/include/system/audio_config.h b/audio/include/system/audio_config.h index 11b857c3..b9fd6b58 100644 --- a/audio/include/system/audio_config.h +++ b/audio/include/system/audio_config.h @@ -52,11 +52,21 @@ static inline std::string audio_find_readable_configuration_file(const char* fil } return {}; } - +/* + * audio_get_audio_policy_config_file() Rules + * 1) A2DP offload NOT supported IMPLIES LE Audio offload NOT supported + * 2) A2DP offload disabled is ignored if A2DP offload is NOT supported + * 3) LE Audio disabled is ignored if LE audio offload is NOT supported + * 4) A2DP offload disabled IMPLIES LE audio offload disabled + * 5) LE Audio offload NOT supported is possible with A2DP offload supported + * 6) LE Audio offload disabled is possible with A2DP offload NOT disabled + */ static inline std::string audio_get_audio_policy_config_file() { static constexpr const char *apmXmlConfigFileName = "audio_policy_configuration.xml"; static constexpr const char *apmA2dpOffloadDisabledXmlConfigFileName = "audio_policy_configuration_a2dp_offload_disabled.xml"; + static constexpr const char *apmLeOffloadDisabledXmlConfigFileName = + "audio_policy_configuration_le_offload_disabled.xml"; static constexpr const char *apmBluetoothLegacyHalXmlConfigFileName = "audio_policy_configuration_bluetooth_legacy_hal.xml"; @@ -71,8 +81,14 @@ static inline std::string audio_get_audio_policy_config_file() { apmBluetoothLegacyHalXmlConfigFileName); } else if (property_get_bool("persist.bluetooth.a2dp_offload.disabled", false)) { // A2DP offload supported but disabled: try to use special XML file + // assume that if a2dp offload is not supported, le offload is not supported as well audioPolicyXmlConfigFile = audio_find_readable_configuration_file( apmA2dpOffloadDisabledXmlConfigFileName); + } else if (!property_get_bool("ro.bluetooth.leaudio_offload.supported", false) || + property_get_bool("persist.bluetooth.leaudio_offload.disabled", false)) { + // A2DP offload supported but LE offload disabled: try to use special XML file + audioPolicyXmlConfigFile = audio_find_readable_configuration_file( + apmLeOffloadDisabledXmlConfigFileName); } } else if (property_get_bool("persist.bluetooth.bluetooth_audio_hal.disabled", false)) { audioPolicyXmlConfigFile = audio_find_readable_configuration_file( |