summaryrefslogtreecommitdiffstats
path: root/media/libeffects
diff options
context:
space:
mode:
authorRicardo Garcia <rago@google.com>2014-12-09 00:57:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 00:57:44 +0000
commit4a2eedc149c5c423ac517a049f357347d9d5dbef (patch)
treea584e534a691bb1359ac4cf5a713f24ae94ad00e /media/libeffects
parent33edcf10489f783a5659ff89ceaca02828496053 (diff)
parent59ca7038364cd6fa3e7e1b52e0e90fa0960af038 (diff)
downloadframeworks_av-4a2eedc149c5c423ac517a049f357347d9d5dbef.zip
frameworks_av-4a2eedc149c5c423ac517a049f357347d9d5dbef.tar.gz
frameworks_av-4a2eedc149c5c423ac517a049f357347d9d5dbef.tar.bz2
am 59ca7038: am 4df79c2c: am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" into lmp-mr1-dev
* commit '59ca7038364cd6fa3e7e1b52e0e90fa0960af038': Fix for AOSP force virtualization mode
Diffstat (limited to 'media/libeffects')
-rw-r--r--media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp10
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) {