diff options
| author | Ricardo Garcia <rago@google.com> | 2014-12-08 19:14:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 19:14:59 +0000 |
| commit | 59ca7038364cd6fa3e7e1b52e0e90fa0960af038 (patch) | |
| tree | 2a54c4146c84d2bb4c80ad3b3576182d3adeaf93 /media/libeffects | |
| parent | 5f480891e5818f111f431ae69b4c1354e302242a (diff) | |
| parent | 4df79c2c13f6163f7d99360a7fb34bf3bd2a5115 (diff) | |
| download | frameworks_av-59ca7038364cd6fa3e7e1b52e0e90fa0960af038.zip frameworks_av-59ca7038364cd6fa3e7e1b52e0e90fa0960af038.tar.gz frameworks_av-59ca7038364cd6fa3e7e1b52e0e90fa0960af038.tar.bz2 | |
am 4df79c2c: am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" into lmp-mr1-dev
* commit '4df79c2c13f6163f7d99360a7fb34bf3bd2a5115':
Fix for AOSP force virtualization mode
Diffstat (limited to 'media/libeffects')
| -rw-r--r-- | media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index 6c2cbe3..3ddeb4e 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -1236,10 +1236,12 @@ int VirtualizerForceVirtualizationMode(EffectContext *pContext, audio_devices_t bool useVirtualizer = false; if (VirtualizerIsDeviceSupported(forcedDevice) != 0) { - // forced device is not supported, make it behave as a reset of forced mode - forcedDevice = AUDIO_DEVICE_NONE; - // but return an error - status = -EINVAL; + if (forcedDevice != AUDIO_DEVICE_NONE) { + //forced device is not supported, make it behave as a reset of forced mode + forcedDevice = AUDIO_DEVICE_NONE; + // but return an error + status = -EINVAL; + } } if (forcedDevice == AUDIO_DEVICE_NONE) { |