Merge "audio: correct setting sequence"
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 01ec998..4b85b21 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -649,6 +649,7 @@
     else
         snd_device = usecase->out_snd_device;
     audio_extn_utils_send_app_type_cfg(adev, usecase);
+    audio_extn_ma_set_device(usecase);
     audio_extn_utils_send_audio_calibration(adev, usecase);
 
     // we shouldn't truncate mixer_path
@@ -1714,8 +1715,6 @@
 
     enable_audio_route(adev, usecase);
 
-    audio_extn_ma_set_device(usecase);
-
     /* If input stream is already running the effect needs to be
        applied on the new input device that's being enabled here.  */
     if (in_snd_device != SND_DEVICE_NONE)