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

Commit a36ff9fd authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix some (but not all) unused parameter warnings"

parents 73b61d3c 7c7be1e0

include/media/AudioRecord.h

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ private: 
            //      NS_INACTIVE inactive so don't run again until re-started

            //      NS_NEVER    never again

            static const nsecs_t NS_WHENEVER = -1, NS_INACTIVE = -2, NS_NEVER = -3;

            nsecs_t processAudioBuffer(const sp<AudioRecordThread>& thread);

            nsecs_t processAudioBuffer();



            // caller must hold lock on mLock for all _l methods

            status_t openRecord_l(size_t epoch);

include/media/AudioTrack.h

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ protected: 
            //      NS_INACTIVE inactive so don't run again until re-started

            //      NS_NEVER    never again

            static const nsecs_t NS_WHENEVER = -1, NS_INACTIVE = -2, NS_NEVER = -3;

            nsecs_t processAudioBuffer(const sp<AudioTrackThread>& thread);

            nsecs_t processAudioBuffer();

            status_t processStreamEnd(int32_t waitCount);

media/libmedia/AudioRecord.cpp

+3 −3
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ ssize_t AudioRecord::read(void* buffer, size_t userSize) 


// -------------------------------------------------------------------------



nsecs_t AudioRecord::processAudioBuffer(const sp<AudioRecordThread>& thread)

nsecs_t AudioRecord::processAudioBuffer()

{

    mLock.lock();

    if (mAwaitBoost) {
@@ -954,7 +954,7 @@ status_t AudioRecord::restoreRecord_l(const char *from) 


// =========================================================================



void AudioRecord::DeathNotifier::binderDied(const wp<IBinder>& who)

void AudioRecord::DeathNotifier::binderDied(const wp<IBinder>& who __unused)

{

    sp<AudioRecord> audioRecord = mAudioRecord.promote();

    if (audioRecord != 0) {
@@ -993,7 +993,7 @@ bool AudioRecord::AudioRecordThread::threadLoop() 
            return true;

        }

    }

    nsecs_t ns =  mReceiver.processAudioBuffer(this);

    nsecs_t ns =  mReceiver.processAudioBuffer();

    switch (ns) {

    case 0:

        return true;

media/libmedia/AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ void AudioSystem::releaseAudioSessionId(int audioSession) { 


// ---------------------------------------------------------------------------



void AudioSystem::AudioFlingerClient::binderDied(const wp<IBinder>& who) {

void AudioSystem::AudioFlingerClient::binderDied(const wp<IBinder>& who __unused) {

    Mutex::Autolock _l(AudioSystem::gLock);



    AudioSystem::gAudioFlinger.clear();
@@ -814,7 +814,7 @@ bool AudioSystem::isOffloadSupported(const audio_offload_info_t& info) 


// ---------------------------------------------------------------------------



void AudioSystem::AudioPolicyServiceClient::binderDied(const wp<IBinder>& who) {

void AudioSystem::AudioPolicyServiceClient::binderDied(const wp<IBinder>& who __unused) {

    Mutex::Autolock _l(AudioSystem::gLock);

    AudioSystem::gAudioPolicyService.clear();

media/libmedia/AudioTrack.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1341,7 +1341,7 @@ status_t TimedAudioTrack::setMediaTimeTransform(const LinearTransform& xform, 


// -------------------------------------------------------------------------



nsecs_t AudioTrack::processAudioBuffer(const sp<AudioTrackThread>& thread)

nsecs_t AudioTrack::processAudioBuffer()

{

    // Currently the AudioTrack thread is not created if there are no callbacks.

    // Would it ever make sense to run the thread, even without callbacks?
@@ -1767,7 +1767,7 @@ String8 AudioTrack::getParameters(const String8& keys) 
    }

}



status_t AudioTrack::dump(int fd, const Vector<String16>& args) const

status_t AudioTrack::dump(int fd, const Vector<String16>& args __unused) const

{



    const size_t SIZE = 256;
@@ -1797,7 +1797,7 @@ uint32_t AudioTrack::getUnderrunFrames() const 


// =========================================================================



void AudioTrack::DeathNotifier::binderDied(const wp<IBinder>& who)

void AudioTrack::DeathNotifier::binderDied(const wp<IBinder>& who __unused)

{

    sp<AudioTrack> audioTrack = mAudioTrack.promote();

    if (audioTrack != 0) {
@@ -1841,7 +1841,7 @@ bool AudioTrack::AudioTrackThread::threadLoop() 
            return true;

        }

    }

    nsecs_t ns = mReceiver.processAudioBuffer(this);

    nsecs_t ns = mReceiver.processAudioBuffer();

    switch (ns) {

    case 0:

        return true;