commit 96df9327fa2d824ade76e76a32b81a360a96ebb0
author Andy Hung <hunga@google.com> Thu Dec 09 03:39:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 09 03:39:59 2021 +0000
tree 4d855d168b4500a494afa59be5b895d1012767e6
parent fe25df68ba8c640e9f6c08102fe9c13dfeff2a0b
parent 5bd56e19467d1dfdd91431d4e4d480cda43d7626

Merge "Fix mediaserver crash issue" am: 518ccbc529 am: 2f6c0e514c am: 5bd56e1946

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1913455

Change-Id: I3627e039db86a5c3f6d8b465c692fcdabc342409

media/libaudioclient/AudioRecord.cpp

diff --git a/media/libaudioclient/AudioRecord.cpp b/media/libaudioclient/AudioRecord.cpp
index 82b18f6..4ff05e4 100644
--- a/media/libaudioclient/AudioRecord.cpp
+++ b/media/libaudioclient/AudioRecord.cpp
@@ -210,11 +210,13 @@
         mAudioRecordThread->requestExitAndWait();
         mAudioRecordThread.clear();
     }
-    // No lock here: worst case we remove a NULL callback which will be a nop
+
+    AutoMutex lock(mLock);
     if (mDeviceCallback != 0 && mInput != AUDIO_IO_HANDLE_NONE) {
         // This may not stop all of these device callbacks!
         // TODO: Add some sort of protection.
         AudioSystem::removeAudioDeviceCallback(this, mInput, mPortId);
+        mDeviceCallback.clear();
     }
 }
 status_t AudioRecord::set(

media/libaudioclient/AudioTrack.cpp

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index c51cd26..a804bc3 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -360,7 +360,8 @@
         mAudioTrackThread->requestExitAndWait();
         mAudioTrackThread.clear();
     }
-    // No lock here: worst case we remove a NULL callback which will be a nop
+
+    AutoMutex lock(mLock);
     if (mDeviceCallback != 0 && mOutput != AUDIO_IO_HANDLE_NONE) {
         // This may not stop all of these device callbacks!
         // TODO: Add some sort of protection.