commit 873738c761c34b56c018783455d908af1edf0605
author François Gaffie <francois.gaffie@ampere.cars> Fri Aug 02 17:09:21 2024 +0200
committer François Gaffie <francois.gaffie@ampere.cars> Thu Sep 05 10:13:26 2024 +0200
tree d1b96b2e15faa27827b73d45b6c5cd90b0d99afb
parent 6c356f0e67578a2f486c15f3fd5bcaeac3bf6985

Migrate forced config and force use to android.media.audio.common.types

Bug: 307310023
Test: m

Change-Id: Ice8700a5968be1051bc9f163ced79c2bd3a91a07
Signed-off-by: François Gaffie <francois.gaffie@ampere.cars>

media/libaudioclient/AudioSystem.cpp

diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index aa51652..b569c99 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -60,6 +60,8 @@
 using media::audio::common::AudioMMapPolicyInfo;
 using media::audio::common::AudioMMapPolicyType;
 using media::audio::common::AudioOffloadInfo;
+using media::audio::common::AudioPolicyForceUse;
+using media::audio::common::AudioPolicyForcedConfig;
 using media::audio::common::AudioSource;
 using media::audio::common::AudioStreamType;
 using media::audio::common::AudioUsage;
@@ -1059,9 +1061,9 @@
     if (aps == 0) return AUDIO_POLICY_FORCE_NONE;
 
     auto result = [&]() -> ConversionResult<audio_policy_forced_cfg_t> {
-        media::AudioPolicyForceUse usageAidl = VALUE_OR_RETURN(
+        AudioPolicyForceUse usageAidl = VALUE_OR_RETURN(
                 legacy2aidl_audio_policy_force_use_t_AudioPolicyForceUse(usage));
-        media::AudioPolicyForcedConfig configAidl;
+        AudioPolicyForcedConfig configAidl;
         RETURN_IF_ERROR(statusTFromBinderStatus(
                 aps->getForceUse(usageAidl, &configAidl)));
         return aidl2legacy_AudioPolicyForcedConfig_audio_policy_forced_cfg_t(configAidl);