Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d62670e authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge changes from topic "modernize mediasyncevent" am: 12a7ed2f am: 52d6f0e9 am: 3e17f76b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2599665



Change-Id: Ibc5ebb7a4e719ab4d5a819001ba2cebd59796462
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5a5f831 3e17f76b

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4007,7 +4007,7 @@ void AudioFlinger::updateSecondaryOutputsForTrack_l( 
sp<audioflinger::SyncEvent> AudioFlinger::createSyncEvent(AudioSystem::sync_event_t type,

                                    audio_session_t triggerSession,

                                    audio_session_t listenerSession,

                                    audioflinger::SyncEventCallback callBack,

                                    const audioflinger::SyncEventCallback& callBack,

                                    const wp<RefBase>& cookie)

{

    Mutex::Autolock _l(mLock);

services/audioflinger/AudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ public: 
    sp<audioflinger::SyncEvent> createSyncEvent(AudioSystem::sync_event_t type,

                                        audio_session_t triggerSession,

                                        audio_session_t listenerSession,

                                        audioflinger::SyncEventCallback callBack,

                                        const audioflinger::SyncEventCallback& callBack,

                                        const wp<RefBase>& cookie);



    bool        btNrecIsOff() const { return mBtNrecIsOff.load(); }