Free data queue before closing data file descriptor.
When data file descriptor is closed, the raw pointer mapped from the
file descriptor is invalidated. In that case, the data queue should be
freed so that it won't access the invalid address.
Bug: 314872581
Test: manually
Change-Id: Ida375e14cc3f9d85d434e45e539c8cff3125f992
diff --git a/media/libaaudio/src/client/AudioStreamInternalPlay.cpp b/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
index 3badb0b..366db31 100644
--- a/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
+++ b/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
@@ -329,8 +329,9 @@
int64_t AudioStreamInternalPlay::getFramesWritten() {
if (mAudioEndpoint) {
- mLastFramesWritten = mAudioEndpoint->getDataWriteCounter()
- + mFramesOffsetFromService;
+ mLastFramesWritten = std::max(
+ mLastFramesWritten,
+ mAudioEndpoint->getDataWriteCounter() + mFramesOffsetFromService);
}
return mLastFramesWritten;
}