summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Cervera <giulio.cervera@gmail.com>2012-06-15 23:15:30 +0200
committerGiulio Cervera <giulio.cervera@gmail.com>2012-06-15 23:19:02 +0200
commitbe21514903b2f7dae72a87296dcd350426fc5e53 (patch)
tree88fdae2d0200c2f328cacfb9f80542e0d285104f
parentf9625bffd7889b9c586b0e6086c0f422a282e789 (diff)
downloadandroid_hardware_qcom_media-be21514903b2f7dae72a87296dcd350426fc5e53.tar.gz
android_hardware_qcom_media-be21514903b2f7dae72a87296dcd350426fc5e53.tar.bz2
android_hardware_qcom_media-be21514903b2f7dae72a87296dcd350426fc5e53.zip
audio/msm8660: fix audio resume with LPA
also handle aic3254 power Change-Id: Ia8cf4ffb85a8ba5123701ae0336130dbae5dbbc2
-rwxr-xr-xaudio/msm8660/AudioHardware.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/audio/msm8660/AudioHardware.cpp b/audio/msm8660/AudioHardware.cpp
index ad13e34a..15009563 100755
--- a/audio/msm8660/AudioHardware.cpp
+++ b/audio/msm8660/AudioHardware.cpp
@@ -1955,7 +1955,7 @@ status_t AudioHardware::do_aic3254_control(uint32_t device) {
break;
}
} else {
- if (checkOutputStandby()) {
+ if (checkOutputStandby() && !isStreamOnAndActive(LPA_DECODE)) {
if (device == SND_DEVICE_FM_HEADSET) {
new_aic_rxmode = FM_OUT_HEADSET;
new_aic_txmode = FM_IN_HEADSET;
@@ -2698,6 +2698,10 @@ status_t AudioHardware::AudioSessionOutMSM7xxx::standby()
}
mStandby = true;
+
+ if (support_aic3254)
+ mHardware->do_aic3254_control(mHardware->get_snd_dev());
+
return status;
}