aaudio: set to SHARED when EXCLUSIVE fails
SHARED streams and endpoints were being created with sharing mode
set to EXCLUSIVE. This was confusing the close() code and caused a hang.
Now we create a modified Request object with the sharing mode set
correctly.
Bug: 112709847
Test: Hack AAudioServiceEndpointMMAP so isBufferShareable is false.
Test: 'adb shell write_sine_callback -pl -x -s2' should not hang.
Change-Id: I7a5c8260beaffdd706f34d35ef00a61b072adb1d
diff --git a/services/oboeservice/AAudioServiceStreamMMAP.cpp b/services/oboeservice/AAudioServiceStreamMMAP.cpp
index c845309..9377945 100644
--- a/services/oboeservice/AAudioServiceStreamMMAP.cpp
+++ b/services/oboeservice/AAudioServiceStreamMMAP.cpp
@@ -64,8 +64,13 @@
sp<AAudioServiceStreamMMAP> keep(this);
- aaudio_result_t result = AAudioServiceStreamBase::open(request,
- AAUDIO_SHARING_MODE_EXCLUSIVE);
+ if (request.getConstantConfiguration().getSharingMode() != AAUDIO_SHARING_MODE_EXCLUSIVE) {
+ ALOGE("%s() sharingMode mismatch %d", __func__,
+ request.getConstantConfiguration().getSharingMode());
+ return AAUDIO_ERROR_INTERNAL;
+ }
+
+ aaudio_result_t result = AAudioServiceStreamBase::open(request);
if (result != AAUDIO_OK) {
return result;
}