Merge "NuPlayerRenderer: Ensure cancelAudioOffloadPauseTimeout cancels timeout" into nyc-dev

}

void NuPlayer::Renderer::cancelAudioOffloadPauseTimeout() {

    if (offloadingAudio()) {

    // We may have called startAudioOffloadPauseTimeout() without

    // the AudioSink open and with offloadingAudio enabled.

    //

    // When we cancel, it may be that offloadingAudio is subsequently disabled, so regardless

    // we always release the wakelock and increment the pause timeout generation.

    //

    // Note: The acquired wakelock prevents the device from suspending

    // immediately after offload pause (in case a resume happens shortly thereafter).

    mWakeLock->release(true);

    ++mAudioOffloadPauseTimeoutGeneration;

}

}

status_t NuPlayer::Renderer::onOpenAudioSink(

        const sp<AMessage> &format,