commit 395acb6b4deb189cc1f2324a3f9ac4bf485e958f
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 15 00:47:35 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 15 00:47:35 2020 +0000
tree a4717f143dbbd9f1f643c0939664968423e268e0
parent 6d10c5298707826076a7b55af48ffe9a7c085024
parent 8da5ebf40512ab6052fd1a0bd97bc4bcf3b0a53a

Merge "av: remove a redundant NULL check" am: 74e4b7bc7f am: 0e40bab475 am: 43af1ebfdd am: 8da5ebf405

Change-Id: I0d46e5296db230af9ef67eb00d5e55bc824e376c

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 749d1ee..1ba968f 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6891,7 +6891,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;
     }