Merge "AudioFlinger: fix getMicrophones implementation"
diff --git a/media/libstagefright/tests/writer/WriterTest.cpp b/media/libstagefright/tests/writer/WriterTest.cpp
index 4d8df2d..f1c599f 100644
--- a/media/libstagefright/tests/writer/WriterTest.cpp
+++ b/media/libstagefright/tests/writer/WriterTest.cpp
@@ -466,7 +466,8 @@
};
TEST_P(ListenerTest, SetMaxFileLimitsTest) {
- if (mDisableTest) return;
+ // TODO(b/151892414): Enable test for other writers
+ if (mDisableTest || mWriterName != MPEG4) return;
ALOGV("Validates writer when max file limits are set");
tuple<string, int32_t, float, float> params = GetParam();
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index cd1e1db..bf4195f 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6725,7 +6725,7 @@
snprintf(mThreadName, kThreadNameLength, "AudioIn_%X", id);
mNBLogWriter = audioFlinger->newWriter_l(kLogSize, mThreadName);
- if (mInput != nullptr && mInput->audioHwDev != nullptr) {
+ if (mInput->audioHwDev != nullptr) {
mIsMsdDevice = strcmp(
mInput->audioHwDev->moduleName(), AUDIO_HARDWARE_MODULE_ID_MSD) == 0;
}