audio: Update NS for functions from h/i/audio/aidl/common/include/Utils.h
These utility functions got moved into 'aidl' namespace,
update code that uses them.
Along the way reorganized lists of includes to match the
style guide.
Bug: 205884982
Test: m
Change-Id: I541e45b9cdb6c85711e53bd8c0cd10a60160bcc5
diff --git a/media/libeffects/preprocessing/aidl/PreProcessingContext.cpp b/media/libeffects/preprocessing/aidl/PreProcessingContext.cpp
index 104277e..c1e4eda 100644
--- a/media/libeffects/preprocessing/aidl/PreProcessingContext.cpp
+++ b/media/libeffects/preprocessing/aidl/PreProcessingContext.cpp
@@ -148,11 +148,11 @@
void PreProcessingContext::updateConfigs(const Parameter::Common& common) {
mInputConfig.set_sample_rate_hz(common.input.base.sampleRate);
- mInputConfig.set_num_channels(
- ::android::hardware::audio::common::getChannelCount(common.input.base.channelMask));
+ mInputConfig.set_num_channels(::aidl::android::hardware::audio::common::getChannelCount(
+ common.input.base.channelMask));
mOutputConfig.set_sample_rate_hz(common.input.base.sampleRate);
- mOutputConfig.set_num_channels(
- ::android::hardware::audio::common::getChannelCount(common.output.base.channelMask));
+ mOutputConfig.set_num_channels(::aidl::android::hardware::audio::common::getChannelCount(
+ common.output.base.channelMask));
}
RetCode PreProcessingContext::setAcousticEchoCancelerEchoDelay(int echoDelayUs) {