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

Commit 84cca0ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio policy: fix bad auto merge conflict resolution"

parents 6d567e1f 5654fa73

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+0 −5
Original line number Diff line number Diff line
@@ -1514,11 +1514,6 @@ status_t AudioPolicyManager::startSource(const sp<AudioOutputDescriptor>& output 
        setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc);

    }



    if (stream == AUDIO_STREAM_ENFORCED_AUDIBLE &&

            mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED) {

        setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc);

    }



    return NO_ERROR;

}