Revert "Audio CAP: Address ANAPIC comments, Part 3 (Split back A..."
Revert submission 3341640-fix-b-364310317-fix-ANAPIC-comments-3
Reason for revert: Droidmonitor created revert due to b/380080376. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:3341640-fix-b-364310317-fix-ANAPIC-comments-3
Change-Id: I1a25ed1e1c61170c0f3f6deff335c17b887c4609
diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 768cd07..b2f0c22 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -60,6 +60,8 @@
using media::audio::common::AudioFormatDescription;
using media::audio::common::AudioMode;
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;
@@ -253,8 +255,8 @@
return Status::ok();
}
-Status AudioPolicyService::setForceUse(media::AudioPolicyForceUse usageAidl,
- media::AudioPolicyForcedConfig configAidl)
+Status AudioPolicyService::setForceUse(AudioPolicyForceUse usageAidl,
+ AudioPolicyForcedConfig configAidl)
{
audio_policy_force_use_t usage = VALUE_OR_RETURN_BINDER_STATUS(
aidl2legacy_AudioPolicyForceUse_audio_policy_force_use_t(usageAidl));
@@ -283,8 +285,8 @@
return Status::ok();
}
-Status AudioPolicyService::getForceUse(media::AudioPolicyForceUse usageAidl,
- media::AudioPolicyForcedConfig* _aidl_return) {
+Status AudioPolicyService::getForceUse(AudioPolicyForceUse usageAidl,
+ AudioPolicyForcedConfig* _aidl_return) {
audio_policy_force_use_t usage = VALUE_OR_RETURN_BINDER_STATUS(
aidl2legacy_AudioPolicyForceUse_audio_policy_force_use_t(usageAidl));