diff options
| author | Ricardo Garcia <rago@google.com> | 2014-12-05 13:54:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 13:54:10 +0000 |
| commit | 4df79c2c13f6163f7d99360a7fb34bf3bd2a5115 (patch) | |
| tree | 33fd881be3965b2e670b5cbf08abe4dac768cb69 /media/libeffects | |
| parent | 4c56f8e0329cbdd0f3406bde96fc6f0bba65664d (diff) | |
| parent | d6e7f1e1f8b1dfa6a87c7c0b1a5c68d435096b01 (diff) | |
| download | frameworks_av-4df79c2c13f6163f7d99360a7fb34bf3bd2a5115.zip frameworks_av-4df79c2c13f6163f7d99360a7fb34bf3bd2a5115.tar.gz frameworks_av-4df79c2c13f6163f7d99360a7fb34bf3bd2a5115.tar.bz2 | |
am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" into lmp-mr1-dev
* commit 'd6e7f1e1f8b1dfa6a87c7c0b1a5c68d435096b01':
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) { |