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

Commit 52d6f0e9 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge changes from topic "modernize mediasyncevent" am: 12a7ed2f 

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



Change-Id: I041822e19d276b6e13845ce050bc032fe3b85193
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c08d92b 12a7ed2f

services/audioflinger/AudioFlinger.cpp

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

sp<audioflinger::SyncEvent> AudioFlinger::createSyncEvent(AudioSystem::sync_event_t type,

                                    audio_session_t triggerSession,

                                    audio_session_t triggerSession,

                                    audio_session_t listenerSession,

                                    audio_session_t listenerSession,

                                    audioflinger::SyncEventCallback callBack,

                                    const audioflinger::SyncEventCallback& callBack,

                                    const wp<RefBase>& cookie)

                                    const wp<RefBase>& cookie)

{

{

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mLock);

services/audioflinger/AudioFlinger.h

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

    sp<audioflinger::SyncEvent> createSyncEvent(AudioSystem::sync_event_t type,

                                        audio_session_t triggerSession,

                                        audio_session_t triggerSession,

                                        audio_session_t listenerSession,

                                        audio_session_t listenerSession,

                                        audioflinger::SyncEventCallback callBack,

                                        const audioflinger::SyncEventCallback& callBack,

                                        const wp<RefBase>& cookie);

                                        const wp<RefBase>& cookie);





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

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