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

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

Merge \"Revert \"Restore old signature for acquire/release session\"\" into nyc-dev 

am: 6e706147

Change-Id: Icbbcfdbbfce7ce8f00e40e58c9a13d1a1a245f37
parents dc43ff40 6e706147

include/media/AudioSystem.h

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

    static void acquireAudioSessionId(audio_session_t audioSession, pid_t pid);

    static void releaseAudioSessionId(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.

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

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

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

    // or no HW sync source is used.

    // or no HW sync source is used.

media/libmedia/AudioSystem.cpp

+0 −12
Original line number Original line Diff line number Diff line
@@ -417,18 +417,6 @@ 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)

audio_hw_sync_t AudioSystem::getAudioHwSyncForSession(audio_session_t sessionId)

{

{

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

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