commit b4f0c8b9b497c7a34485c1a3fa0f93acbf89f017
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 15 01:10:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 15 01:10:23 2020 +0000
tree 4257087735d21ac58d966860701d223aecda5bfa
parent a2b2857328d36e9e696aa49bc728854f7bfcc7cc
parent 395acb6b4deb189cc1f2324a3f9ac4bf485e958f

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

Change-Id: I0c4cd7355cbf625c8159e98e08b359f8d014fdce

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 090e6d2..08df775 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6890,7 +6890,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;
     }