commit d5e8f5fefe0d2a3199e00572fe7158d0706bfd63
author Linux Build Service Account <lnxbuild@localhost> Mon Feb 29 06:27:44 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Feb 29 06:27:44 2016 -0800
tree 93c02fb6d4562a79f1ed8bb86c95aec426de071b
parent 62e3422f85330358d16452e3bc4bf227e6f83f9a
parent 74a2eee12a1b30c5e80cebd0b3878a90f28b0b50

Merge "hal: support wsa combo for jacala" into av-userspace.lnx.1.0-dev.1.0

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index cbebf42..3c3686f 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1626,7 +1626,7 @@
     // This may prevent offloading in rare situations where effects are left active by apps
     // in the background.
 
-    if (((flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) == 0) ||
+    if (((flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) == 0) &&
             !mEffects.isNonOffloadableEffectEnabled()) {
         profile = getProfileForDirectOutput(device,
                                            samplingRate,