commit bb8526358b9bf09ffc79b8f54dd57140df4fb2d6
author Chien-Yu Chen <cychen@google.com> Thu Aug 04 23:06:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 04 23:06:35 2016 +0000
tree 260f811174a52de6cf0ce953525544535c7daa0a
parent 065d4e648df62386895059a03209a02b99e028a2
parent e4fe21bb7cef893cd38bd194ea880333389aea38

Merge "CameraService: Notify flashlight about device close" into nyc-mr1-dev

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 4cde70d..e3e518c 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1733,9 +1733,11 @@
 // resetVolume_l() must be called with PlaybackThread::mLock or EffectChain::mLock held
 void AudioFlinger::EffectChain::resetVolume_l()
 {
-    uint32_t left = mLeftVolume;
-    uint32_t right = mRightVolume;
-    (void)setVolume_l(&left, &right, true);
+    if ((mLeftVolume != UINT_MAX) && (mRightVolume != UINT_MAX)) {
+        uint32_t left = mLeftVolume;
+        uint32_t right = mRightVolume;
+        (void)setVolume_l(&left, &right, true);
+    }
 }
 
 void AudioFlinger::EffectChain::syncHalEffectsState()

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index c0bb4e7..b752541 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -273,6 +273,9 @@
         }
 
         closeAllInputs();
+        // As the input device list can impact the output device selection, update
+        // getDeviceForStrategy() cache
+        updateDevicesAndOutputs();
 
         if (mEngine->getPhoneState() == AUDIO_MODE_IN_CALL && hasPrimaryOutput()) {
             audio_devices_t newDevice = getNewOutputDevice(mPrimaryOutput, false /*fromCache*/);