commit 7c2806828c9e83c5ba64ef2c14e5a7fe08f29472
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 08 10:36:59 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 08 10:36:59 2015 -0700
tree 9436beac745cef4eca429f3232a2d990824a2bbd
parent 000aeddf0a97e444385c8997da61dc137883d7c8
parent 0428e2e94868b9cfc25cf95d68131b1961fb8269

Merge "Merge 90ff1782dbc2bc05498aa61ddeb0f578192e868c on remote branch"

hal/audio_extn/utils.c

diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index b3e6331..8a46e70 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -580,14 +580,13 @@
 
     if ((24 == usecase->stream.out->bit_width) &&
         (usecase->stream.out->devices & AUDIO_DEVICE_OUT_SPEAKER)) {
-        sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+        out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
     } else if ((snd_device != SND_DEVICE_OUT_HEADPHONES_44_1 &&
         usecase->stream.out->sample_rate == OUTPUT_SAMPLING_RATE_44100) ||
         (usecase->stream.out->sample_rate < OUTPUT_SAMPLING_RATE_44100)) {
-        sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
-    } else {
-        sample_rate = out->app_type_cfg.sample_rate;
+        out->app_type_cfg.sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
     }
+    sample_rate = out->app_type_cfg.sample_rate;
 
     app_type_cfg[len++] = out->app_type_cfg.app_type;
     app_type_cfg[len++] = acdb_dev_id;

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 05f369e..37125f7 100755
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -424,8 +424,8 @@
     audio_extn_dolby_ds2_set_endpoint(adev);
     audio_extn_sound_trigger_update_stream_status(usecase, ST_EVENT_STREAM_BUSY);
     audio_extn_listen_update_stream_status(usecase, LISTEN_EVENT_STREAM_BUSY);
-    audio_extn_utils_send_audio_calibration(adev, usecase);
     audio_extn_utils_send_app_type_cfg(usecase);
+    audio_extn_utils_send_audio_calibration(adev, usecase);
     strlcpy(mixer_path, use_case_table[usecase->id], MIXER_PATH_MAX_LENGTH);
     platform_add_backend_name(mixer_path, snd_device, usecase);
     ALOGV("%s: apply mixer and update path: %s", __func__, mixer_path);