commit d6e7f1e1f8b1dfa6a87c7c0b1a5c68d435096b01
author Ricardo Garcia <rago@google.com> Fri Dec 05 13:46:58 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 05 13:46:58 2014 +0000
tree 33fd881be3965b2e670b5cbf08abe4dac768cb69
parent b65842dd9447a7925046b2285b2aa8459dc63ed3
parent 47d4c9a4d53ed014b520edbda2edc3e280efb8a5

Merge "Fix for AOSP force virtualization mode" into lmp-mr1-dev

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

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 @@
     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) {