commit 0f97ee5a52d697e31e9c6dc3c9e7aa941168b571
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 18 22:25:32 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 18 22:25:32 2020 +0000
tree b24e61ac061d57ac858650b5a6d0940b144b50b3
parent ae3b9539cead752af48515f2e43c9985c3fc04e6
parent 5e4d86f837c1b978d4c5d69964a769c5a26e3fae

Merge "audioflinger: remove null checks"

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 3726b9a..6ef2035 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -1872,7 +1872,7 @@
     // and the mute set to false).
     mMasterVolume = audioFlinger->masterVolume_l();
     mMasterMute = audioFlinger->masterMute_l();
-    if (mOutput && mOutput->audioHwDev) {
+    if (mOutput->audioHwDev) {
         if (mOutput->audioHwDev->canSetMasterVolume()) {
             mMasterVolume = 1.0;
         }
@@ -2832,7 +2832,7 @@
             this/* srcThread */, this/* dstThread */);
     }
 
-    audio_output_flags_t flags = mOutput != nullptr ? mOutput->flags : AUDIO_OUTPUT_FLAG_NONE;
+    audio_output_flags_t flags = mOutput->flags;
     mediametrics::LogItem item(mMetricsId);
     item.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_READPARAMETERS)
         .set(AMEDIAMETRICS_PROP_ENCODING, formatToString(mFormat).c_str())