commit 0e3523c56e38301cad098a43e3edf4ff0f8939c4
author Paul Mclean <pmclean@google.com> Tue Apr 13 13:55:10 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 13 13:55:10 2021 +0000
tree 74335c383c8d1f10dd753acd022df08bb55e665e
parent 1d0f36c18d628eb43b3ef531e8b6e063f08ee7a9
parent 8a661a39941effd8fde39006700db0ff5840a48e

Merge "Add state testing to RecordThread "Microphone" methods" into sc-dev

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 4b8d919..997f24a 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -8108,6 +8108,9 @@
 {
     ALOGV("RecordThread::getActiveMicrophones");
     AutoMutex _l(mLock);
+    if (mInput == nullptr || mInput->stream == nullptr) {
+        return NO_INIT;
+    }
     status_t status = mInput->stream->getActiveMicrophones(activeMicrophones);
     return status;
 }
@@ -8117,6 +8120,9 @@
 {
     ALOGV("setPreferredMicrophoneDirection(%d)", direction);
     AutoMutex _l(mLock);
+    if (mInput == nullptr || mInput->stream == nullptr) {
+        return NO_INIT;
+    }
     return mInput->stream->setPreferredMicrophoneDirection(direction);
 }
 
@@ -8124,6 +8130,9 @@
 {
     ALOGV("setPreferredMicrophoneFieldDimension(%f)", zoom);
     AutoMutex _l(mLock);
+    if (mInput == nullptr || mInput->stream == nullptr) {
+        return NO_INIT;
+    }
     return mInput->stream->setPreferredMicrophoneFieldDimension(zoom);
 }