commit fbb92982c39877cd63f53f3763209fcff97c5446
author Zhou Song <zhous@codeaurora.org> Thu Jan 09 12:43:50 2020 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 28 22:48:49 2020 -0700
tree 1b60f60d785fd0dfbd4a44d54295ec46d7835630
parent e47bf15df04aeb0635cf23bc6d6235fb5b916243

hal: fix internal codec flag not initialized

The internal codec flag is checked during early of
platform_init, so move it back to the earlier place
to get it initialized.
This is to make sure correct platform configuration
file can be loaded for platforms with internal codec.

Change-Id: I5049b6103651d1c4641a9d9be85f5e244e9c637c

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index f81fbba..9ef7795 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2972,6 +2972,8 @@
         return NULL;
     }
 
+    update_codec_type_and_interface(my_data, snd_card_name);
+
     adev->dp_allowed_for_voice =
         property_get_bool("vendor.audio.enable.dp.for.voice", false);
 
@@ -3218,10 +3220,8 @@
 
         ALOGD("%s: Loading mixer file: %s", __func__, mixer_xml_file);
         if (audio_extn_read_xml(adev, adev->snd_card, mixer_xml_file,
-                                MIXER_XML_PATH_AUXPCM) == -ENOSYS) {
+                                MIXER_XML_PATH_AUXPCM) == -ENOSYS)
             adev->audio_route = audio_route_init(adev->snd_card, mixer_xml_file);
-            update_codec_type_and_interface(my_data, snd_card_name);
-        }
     }
     audio_extn_perf_lock_release(&adev->perf_lock_handle);