commit 0cdd9a51e4785ab6e22ea2f5d4112755d867cc84
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 05 14:43:07 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 05 14:43:07 2025 -0800
tree 14f7b429d7241f907ba9313ab1950da004a9203b
parent 5b71490d7340089e88ed31c1e096b017f4c82386
parent b9a69e2221dee6b7ba75e328adbe4ccb276053c6

Merge "audio: Fix MonoPipe ownership in StreamRemoteSubmix" into main

audio/aidl/default/r_submix/StreamRemoteSubmix.cpp

diff --git a/audio/aidl/default/r_submix/StreamRemoteSubmix.cpp b/audio/aidl/default/r_submix/StreamRemoteSubmix.cpp
index cef0ea6..f8ead16 100644
--- a/audio/aidl/default/r_submix/StreamRemoteSubmix.cpp
+++ b/audio/aidl/default/r_submix/StreamRemoteSubmix.cpp
@@ -283,6 +283,15 @@
         }
         return ::android::OK;
     }
+    // get and hold the sink because 'MonoPipeReader' does not hold a strong pointer to it.
+    sp<MonoPipe> sink = mCurrentRoute->getSink();
+    if (sink == nullptr) {
+        if (++mReadErrorCount < kMaxErrorLogs) {
+            LOG(ERROR) << __func__
+                       << ": the sink has been released! (not all errors will be logged)";
+        }
+        return ::android::OK;
+    }
     mReadErrorCount = 0;
 
     LOG(VERBOSE) << __func__ << ": " << mDeviceAddress.toString() << ", " << frameCount