early-access version 3641

src/audio_core/sink/sink_stream.cpp

@@ -272,13 +272,10 @@ void SinkStream::WaitFreeSpace(std::stop_token stop_token) {
     std::unique_lock lk{release_mutex};
     release_cv.wait_for(lk, std::chrono::milliseconds(5),
                         [this]() { return queued_buffers < max_queue_size; });
-#ifndef ANDROID
-    // This wait can cause a problematic shutdown hang on Android.
     if (queued_buffers > max_queue_size + 3) {
         Common::CondvarWait(release_cv, lk, stop_token,
                             [this] { return queued_buffers < max_queue_size; });
     }
-#endif
 }
 
 } // namespace AudioCore::Sink