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

Commit 3fa5391f authored by Carter Hsu's avatar Carter Hsu Committed by Automerger Merge Worker
Browse files

AudioFlinger: revert adjust standby delay on VOIP RX output am: 0ca47c2b am:... 

AudioFlinger: revert adjust standby delay on VOIP RX output am: 0ca47c2b am: 66c2205b am: 0611fe7c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23531926



Change-Id: I740d6b6b3dd9132ce2da1264a1e4b9529f813fc1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4185d2bd 0611fe7c

services/audioflinger/Threads.cpp

+1 −6
Original line number Diff line number Diff line
@@ -3552,12 +3552,7 @@ void AudioFlinger::PlaybackThread::cacheParameters_l() 
    mIdleSleepTimeUs = idleSleepTimeUs();



    mStandbyDelayNs = AudioFlinger::mStandbyTimeInNsecs;

    // Shorten standby delay on VOIP RX output to avoid delayed routing updates

    // after a call due to call end tone.

    if (mOutput != nullptr && (mOutput->flags & AUDIO_OUTPUT_FLAG_VOIP_RX) != 0) {

        const nsecs_t NS_PER_MS = 1000000;

        mStandbyDelayNs = std::min(mStandbyDelayNs, latency_l() * NS_PER_MS);

    }



    // make sure standby delay is not too short when connected to an A2DP sink to avoid

    // truncating audio when going to standby.

    if (!Intersection(outDeviceTypes(),  getAudioDeviceOutAllA2dpSet()).empty()) {