commit 49209a36958218c6f51bb9a8e603a69e496481f0
author Andy Hung <hunga@google.com> Wed Dec 14 20:27:15 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 14 20:27:15 2016 +0000
tree 1fbfff2985f2547bdb8928e689cfc0ca55addc95
parent 2d1a8787320b9d4f516038a9703462cee0a090b8
parent a76c7de622e6e29f8559921d8d2e9ef93eb37d1f

Merge "APM::updateCallRouting: ignore for stub output hal" into cw-f-dev

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 968b80f..d265f11 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -330,7 +330,7 @@
     DeviceVector deviceList;
     uint32_t muteWaitMs = 0;
 
-    if(!hasPrimaryOutput()) {
+    if(!hasPrimaryOutput() || mPrimaryOutput->device() == AUDIO_DEVICE_OUT_STUB) {
         return muteWaitMs;
     }
     audio_devices_t txDevice = getDeviceAndMixForInputSource(AUDIO_SOURCE_VOICE_COMMUNICATION);