Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13212f83 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 0ef57993: Merge "Fix issue 2988031." into gingerbread 

* commit '0ef57993':
  Fix issue 2988031.
parents 145643ca 0ef57993

services/audioflinger/AudioPolicyManagerBase.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1806,7 +1806,8 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand 
        AudioSystem::DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

        AudioSystem::DEVICE_OUT_WIRED_HEADSET |

        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE)) &&

        (getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) &&

        ((getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) ||

         (stream == AudioSystem::SYSTEM)) &&

        streamDesc.mCanBeMuted) {

        volume *= SONIFICATION_HEADSET_VOLUME_FACTOR;

        // when the phone is ringing we must consider that music could have been paused just before