commit 1d2d2aea928c759c61a815d64a4018ded22ebcd3
author Andy Hung <hunga@google.com> Wed Jul 19 16:22:58 2023 -0700
committer Andy Hung <hunga@google.com> Fri Jul 21 11:21:23 2023 -0700
tree 73e981164e4e103ba931a8c45f9df24cbdae0b0a
parent 0f725b47bbe8a2a95559b4c14be17403c8c3bbd7

AudioFlinger: Use callback to get screen state

Avoid using a static member to get access without
a shared pointer.

Test: atest AudioRecordTest AudioTrackTest
Test: Camera YouTube
Bug: 292018229
Change-Id: I17228618a61b626e8f530a3a1946fbe9a7893fd4

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 29df1d8..e43ce6c 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -2067,7 +2067,7 @@
         mUseAsyncWrite(false),
         mWriteAckSequence(0),
         mDrainSequence(0),
-        mScreenState(AudioFlinger::mScreenState),
+        mScreenState(mAfThreadCallback->getScreenState()),
         // index 0 is reserved for normal mixer's submix
         mFastTrackAvailMask(((1 << FastMixerState::sMaxFastTracks) - 1) & ~1),
         mHwSupportsPause(false), mHwPaused(false), mFlushPending(false),
@@ -3400,7 +3400,7 @@
 
         ATRACE_BEGIN("write");
         // update the setpoint when AudioFlinger::mScreenState changes
-        uint32_t screenState = AudioFlinger::mScreenState;
+        const uint32_t screenState = mAfThreadCallback->getScreenState();
         if (screenState != mScreenState) {
             mScreenState = screenState;
             MonoPipe *pipe = (MonoPipe *)mPipeSink.get();