commit f2d8470b1c8efe422f73adf682e7858810d7fa4a
author Phil Burk <philburk@google.com> Mon Oct 12 23:42:30 2020 +0000
committer Phil Burk <philburk@google.com> Tue Dec 01 12:43:19 2020 -0800
tree 7277bc73082c1a200acf96ae779923467198bb11
parent 763b935ef71fbe678d9c402b2c9f6cbefbdb68f6

aaudio: use strong pointer to protect callback

Hold a strong pointer to the AudioStream so it cannot get deleted while
the MMAP callback is running.

Also fixes disconnect for shared streams, which was broken
by a previous attempt to fix b/166877425

Bug: 166877425
Bug: 170551030
Test: see bug for details
Test: atest AAudioTestCases
Test: OboeTester V1.5.30 or later, "TEST DISCONNECT"
Change-Id: I236e2d68632070d253d14ddf7b9d7076e068830a
Merged-In: I236e2d68632070d253d14ddf7b9d7076e068830a
(cherry picked from commit e358ec63eedd7a6289984b1f2468c5c16c2ff6c8)

services/oboeservice/AAudioServiceEndpointPlay.cpp

diff --git a/services/oboeservice/AAudioServiceEndpointPlay.cpp b/services/oboeservice/AAudioServiceEndpointPlay.cpp
index dfe7193..89aa70d 100644
--- a/services/oboeservice/AAudioServiceEndpointPlay.cpp
+++ b/services/oboeservice/AAudioServiceEndpointPlay.cpp
@@ -145,7 +145,9 @@
         result = getStreamInternal()->write(mMixer.getOutputBuffer(),
                                             getFramesPerBurst(), timeoutNanos);
         if (result == AAUDIO_ERROR_DISCONNECTED) {
-            ALOGV("%s() write() returned AAUDIO_ERROR_DISCONNECTED, break", __func__);
+            ALOGD("%s() write() returned AAUDIO_ERROR_DISCONNECTED", __func__);
+            // We do not need the returned vector.
+            (void) AAudioServiceEndpointShared::disconnectRegisteredStreams();
             break;
         } else if (result != getFramesPerBurst()) {
             ALOGW("callbackLoop() wrote %d / %d",