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

Commit c3b8968c authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge \\"Restore old signature for acquire/release session\\" into nyc-dev am: ef9cab1d 

am: 20ca8a71

Change-Id: Iafa989fcaab7678cfc5b4d6305322591e717caa3
parents fcde3a93 20ca8a71

include/media/AudioSystem.h

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ public: 
    static void acquireAudioSessionId(audio_session_t audioSession, pid_t pid);

    static void releaseAudioSessionId(audio_session_t audioSession, pid_t pid);



    // FIXME remove

    static void acquireAudioSessionId(int audioSession, pid_t pid);

    static void releaseAudioSessionId(int audioSession, pid_t pid);



    // Get the HW synchronization source used for an audio session.

    // Return a valid source or AUDIO_HW_SYNC_INVALID if an error occurs

    // or no HW sync source is used.

media/libmedia/AudioSystem.cpp

+12 −0
Original line number Diff line number Diff line
@@ -417,6 +417,18 @@ void AudioSystem::releaseAudioSessionId(audio_session_t audioSession, pid_t pid) 
    }

}



// FIXME remove

void AudioSystem::acquireAudioSessionId(int audioSession, pid_t pid)

{

    acquireAudioSessionId((audio_session_t) audioSession, pid);

}



// FIXME remove

void AudioSystem::releaseAudioSessionId(int audioSession, pid_t pid)

{

    releaseAudioSessionId((audio_session_t) audioSession, pid);

}



audio_hw_sync_t AudioSystem::getAudioHwSyncForSession(audio_session_t sessionId)

{

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();