Merge "AudioFlinger: add check for NULL mInput in MMAP Thread"
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index e70e567..3dae1e9 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -9143,7 +9143,13 @@
status_t AudioFlinger::MmapCaptureThread::exitStandby()
{
- mInput->stream->setGain(1.0f);
+ {
+ // mInput might have been cleared by clearInput()
+ Mutex::Autolock _l(mLock);
+ if (mInput != nullptr && mInput->stream != nullptr) {
+ mInput->stream->setGain(1.0f);
+ }
+ }
return MmapThread::exitStandby();
}