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

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

Merge "Do not allow set sample rate when haptic channels exists."

parents 424993f0 f4de6114

media/libaudioclient/AudioTrack.cpp

+2 −1
Original line number Diff line number Diff line
@@ -952,7 +952,8 @@ status_t AudioTrack::setSampleRate(uint32_t rate) 
    if (rate == mSampleRate) {

        return NO_ERROR;

    }

    if (isOffloadedOrDirect_l() || (mFlags & AUDIO_OUTPUT_FLAG_FAST)) {

    if (isOffloadedOrDirect_l() || (mFlags & AUDIO_OUTPUT_FLAG_FAST)

            || (mChannelMask & AUDIO_CHANNEL_HAPTIC_ALL)) {

        return INVALID_OPERATION;

    }

    if (mOutput == AUDIO_IO_HANDLE_NONE) {