diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-14 06:17:51 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-14 06:17:51 -0800 |
| commit | 80f4a45ae5f3294ec9a711cdc1ed3acc0a018d2a (patch) | |
| tree | 3993dd51b3eaf3d5eacf97bf84b37c88300ff24f | |
| parent | 856b5771d1d4e4dbfbc37d977bfde32651e1121f (diff) | |
| parent | 8abf4f4ff62643bc39a5b6ef08ce2683af6c9a19 (diff) | |
| download | android_hardware_qcom_audio-80f4a45ae5f3294ec9a711cdc1ed3acc0a018d2a.tar.gz android_hardware_qcom_audio-80f4a45ae5f3294ec9a711cdc1ed3acc0a018d2a.tar.bz2 android_hardware_qcom_audio-80f4a45ae5f3294ec9a711cdc1ed3acc0a018d2a.zip | |
Merge "policy_hal: fix for FM playback without active music stream"
| -rw-r--r-- | policy_hal/AudioPolicyManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp index 257e9055..09747ebe 100644 --- a/policy_hal/AudioPolicyManager.cpp +++ b/policy_hal/AudioPolicyManager.cpp @@ -280,12 +280,13 @@ status_t AudioPolicyManagerCustom::setDeviceConnectionStateInt(audio_devices_t d #ifdef FM_POWER_OPT // handle FM device connection state to trigger FM AFE loopback if (device == AUDIO_DEVICE_OUT_FM && hasPrimaryOutput()) { - audio_devices_t newDevice = getNewOutputDevice(mPrimaryOutput, false /*fromCache*/); + audio_devices_t newDevice = AUDIO_DEVICE_NONE; if (state == AUDIO_POLICY_DEVICE_STATE_AVAILABLE) { mPrimaryOutput->changeRefCount(AUDIO_STREAM_MUSIC, 1); - newDevice = newDevice | AUDIO_DEVICE_OUT_FM; + newDevice = (audio_devices_t)(getNewOutputDevice(mPrimaryOutput, false)|AUDIO_DEVICE_OUT_FM); mFMIsActive = true; } else { + newDevice = (audio_devices_t)(getNewOutputDevice(mPrimaryOutput, false)); mFMIsActive = false; mPrimaryOutput->changeRefCount(AUDIO_STREAM_MUSIC, -1); } |