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

Commit 1b1c4276 authored by Carter Hsu's avatar Carter Hsu Committed by Android (Google) Code Review
Browse files

Merge "audio: fix the Ultrasound is denied or muted"

parents b0f71f0b 1a3364ab

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5304,7 +5304,8 @@ void AudioPolicyManager::onNewAudioModulesAvailableInt(DeviceVector *newDevices) 
                ALOGW("Output profile contains no device on module %s", hwModule->getName());

                continue;

            }

            if ((outProfile->getFlags() & AUDIO_OUTPUT_FLAG_TTS) != 0) {

            if ((outProfile->getFlags() & AUDIO_OUTPUT_FLAG_TTS) != 0 ||

                (outProfile->getFlags() & AUDIO_OUTPUT_FLAG_ULTRASOUND) != 0) {

                mTtsOutputAvailable = true;

            }

services/audiopolicy/managerdefault/AudioPolicyManager.h

+2 −1
Original line number Diff line number Diff line
@@ -859,7 +859,8 @@ protected: 
        uint32_t mBeaconMuteRefCount;   // ref count for stream that would mute beacon

        uint32_t mBeaconPlayingRefCount;// ref count for the playing beacon streams

        bool mBeaconMuted;              // has STREAM_TTS been muted

        bool mTtsOutputAvailable;       // true if a dedicated output for TTS stream is available

        // true if a dedicated output for TTS stream or Ultrasound is available

        bool mTtsOutputAvailable;



        bool mMasterMono;               // true if we wish to force all outputs to mono

        AudioPolicyMixCollection mPolicyMixes; // list of registered mixes