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

Commit a410d5a7 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 6d42d806: Merge change I9cc489a2 into eclair 

Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2

* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
parents bf697e37 148b266a

media/libmedia/AudioRecord.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ status_t AudioRecord::set( 
    audio_io_handle_t input = AudioSystem::getInput(inputSource,

    audio_io_handle_t input = AudioSystem::getInput(inputSource,

                                    sampleRate, format, channels, (AudioSystem::audio_in_acoustics)flags);

                                    sampleRate, format, channels, (AudioSystem::audio_in_acoustics)flags);

    if (input == 0) {

    if (input == 0) {

        LOGE("Could not get audio output for stream type %d", inputSource);

        LOGE("Could not get audio input for record source %d", inputSource);

        return BAD_VALUE;

        return BAD_VALUE;

    }

    }
@@ -539,7 +539,6 @@ ssize_t AudioRecord::read(void* buffer, size_t userSize) 
        return BAD_VALUE;

        return BAD_VALUE;

    }

    }





    LOGV("read size: %d", userSize);





    do {

    do {