Merge "hal: avoid redundant device switch during playback."
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 1e70bab..3f426e9 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -6422,7 +6422,8 @@
         ALOGI("%s: new_snd_devices[%d] is %d", __func__, i, new_snd_devices[i]);
         if ((platform_check_codec_backend_cfg(adev, usecase, new_snd_devices[i],
                                              &backend_cfg)) ||
-             (!platform_check_backends_match(usecase->out_snd_device, snd_device))) {
+            ((usecase->out_snd_device != SND_DEVICE_NONE) &&
+             !platform_check_backends_match(usecase->out_snd_device, snd_device))) {
             ret = platform_set_codec_backend_cfg(adev, new_snd_devices[i],
                                            backend_cfg);
             if (!ret) {