commit f3a626fa54d1ad52673655edaf849b5a6b7c44ab
author Phil Burk <philburk@google.com> Wed Sep 02 19:50:36 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 02 19:50:36 2020 +0000
tree c53c739d09c181a4cdd7d9eb993b441c03615d50
parent 6ea4a7734d29692c0a5f3093881a859f959834f4
parent 4e8396f030bc2d63714f345e1b9985adc0733211

Merge "aaudio: fix crash on disconnect for shared streams"

services/oboeservice/AAudioServiceEndpointCapture.cpp

diff --git a/services/oboeservice/AAudioServiceEndpointCapture.cpp b/services/oboeservice/AAudioServiceEndpointCapture.cpp
index 206a264..1401120 100644
--- a/services/oboeservice/AAudioServiceEndpointCapture.cpp
+++ b/services/oboeservice/AAudioServiceEndpointCapture.cpp
@@ -65,7 +65,7 @@
         result = getStreamInternal()->read(mDistributionBuffer.get(),
                 getFramesPerBurst(), timeoutNanos);
         if (result == AAUDIO_ERROR_DISCONNECTED) {
-            disconnectRegisteredStreams();
+            ALOGV("%s() read() returned AAUDIO_ERROR_DISCONNECTED, break", __func__);
             break;
         } else if (result != getFramesPerBurst()) {
             ALOGW("callbackLoop() read %d / %d",

services/oboeservice/AAudioServiceEndpointPlay.cpp

diff --git a/services/oboeservice/AAudioServiceEndpointPlay.cpp b/services/oboeservice/AAudioServiceEndpointPlay.cpp
index 730d161..08d2319 100644
--- a/services/oboeservice/AAudioServiceEndpointPlay.cpp
+++ b/services/oboeservice/AAudioServiceEndpointPlay.cpp
@@ -146,7 +146,7 @@
         result = getStreamInternal()->write(mMixer.getOutputBuffer(),
                                             getFramesPerBurst(), timeoutNanos);
         if (result == AAUDIO_ERROR_DISCONNECTED) {
-            AAudioServiceEndpointShared::disconnectRegisteredStreams();
+            ALOGV("%s() write() returned AAUDIO_ERROR_DISCONNECTED, break", __func__);
             break;
         } else if (result != getFramesPerBurst()) {
             ALOGW("callbackLoop() wrote %d / %d",