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

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

Merge "Fix build warning"

parents 2e77ad2a f063b49e

media/libmedia/AudioEffect.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -202,7 +202,7 @@ bool AudioEffect::getEnabled() const 
status_t AudioEffect::setEnabled(bool enabled)

status_t AudioEffect::setEnabled(bool enabled)

{

{

    if (mStatus != NO_ERROR) {

    if (mStatus != NO_ERROR) {

        return (mStatus == ALREADY_EXISTS) ? INVALID_OPERATION : mStatus;

        return (mStatus == ALREADY_EXISTS) ? (status_t) INVALID_OPERATION : mStatus;

    }

    }





    status_t status = NO_ERROR;

    status_t status = NO_ERROR;
@@ -263,7 +263,7 @@ status_t AudioEffect::command(uint32_t cmdCode, 
status_t AudioEffect::setParameter(effect_param_t *param)

status_t AudioEffect::setParameter(effect_param_t *param)

{

{

    if (mStatus != NO_ERROR) {

    if (mStatus != NO_ERROR) {

        return (mStatus == ALREADY_EXISTS) ? INVALID_OPERATION : mStatus;

        return (mStatus == ALREADY_EXISTS) ? (status_t) INVALID_OPERATION : mStatus;

    }

    }





    if (param == NULL || param->psize == 0 || param->vsize == 0) {

    if (param == NULL || param->psize == 0 || param->vsize == 0) {
@@ -281,7 +281,7 @@ status_t AudioEffect::setParameter(effect_param_t *param) 
status_t AudioEffect::setParameterDeferred(effect_param_t *param)

status_t AudioEffect::setParameterDeferred(effect_param_t *param)

{

{

    if (mStatus != NO_ERROR) {

    if (mStatus != NO_ERROR) {

        return (mStatus == ALREADY_EXISTS) ? INVALID_OPERATION : mStatus;

        return (mStatus == ALREADY_EXISTS) ? (status_t) INVALID_OPERATION : mStatus;

    }

    }





    if (param == NULL || param->psize == 0 || param->vsize == 0) {

    if (param == NULL || param->psize == 0 || param->vsize == 0) {
@@ -307,7 +307,7 @@ status_t AudioEffect::setParameterDeferred(effect_param_t *param) 
status_t AudioEffect::setParameterCommit()

status_t AudioEffect::setParameterCommit()

{

{

    if (mStatus != NO_ERROR) {

    if (mStatus != NO_ERROR) {

        return (mStatus == ALREADY_EXISTS) ? INVALID_OPERATION : mStatus;

        return (mStatus == ALREADY_EXISTS) ? (status_t) INVALID_OPERATION : mStatus;

    }

    }





    Mutex::Autolock _l(mCblk->lock);

    Mutex::Autolock _l(mCblk->lock);

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -4122,7 +4122,7 @@ void AudioFlinger::PlaybackThread::TimedTrack::releaseBuffer( 
        TimedBuffer& head = mTimedBufferQueue.editItemAt(0);

        TimedBuffer& head = mTimedBufferQueue.editItemAt(0);





        void* start = head.buffer()->pointer();

        void* start = head.buffer()->pointer();

        void* end   = head.buffer()->pointer() + head.buffer()->size();

        void* end   = (char *) head.buffer()->pointer() + head.buffer()->size();





        if ((buffer->raw >= start) && (buffer->raw <= end)) {

        if ((buffer->raw >= start) && (buffer->raw <= end)) {

            head.setPosition(head.position() +

            head.setPosition(head.position() +