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

Commit 2cccd133 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 2042 into donut 

* changes:
  Remove deprecated openInputStream factory method
parents 1afd622b 6c41033c

libs/audioflinger/A2dpAudioInterface.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -62,17 +62,6 @@ public: 
                                status_t *status,

                                status_t *status,

                                AudioSystem::audio_in_acoustics acoustics);

                                AudioSystem::audio_in_acoustics acoustics);





    // DEPRECATED - WILL BE REMOVED

    virtual AudioStreamIn* openInputStream(

                                int format,

                                int channelCount,

                                uint32_t sampleRate,

                                status_t *status,

                                AudioSystem::audio_in_acoustics acoustics)

    {

        return openInputStream(-1, format, channelCount, sampleRate, status, acoustics);

    }



protected:

protected:

    virtual status_t    doRouting();

    virtual status_t    doRouting();

    virtual status_t    dump(int fd, const Vector<String16>& args);

    virtual status_t    dump(int fd, const Vector<String16>& args);

libs/audioflinger/AudioDumpInterface.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -82,10 +82,6 @@ public: 
            uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics)

            uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics)

        { return mFinalInterface->openInputStream(inputSource, format, channelCount, sampleRate, status, acoustics); }

        { return mFinalInterface->openInputStream(inputSource, format, channelCount, sampleRate, status, acoustics); }





    virtual AudioStreamIn* openInputStream(int format, int channelCount, uint32_t sampleRate,

            status_t *status, AudioSystem::audio_in_acoustics acoustics)

        { return mFinalInterface->openInputStream(-1, format, channelCount, sampleRate, status, acoustics); }



    virtual status_t    dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); }

    virtual status_t    dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); }





protected:

protected:

libs/audioflinger/AudioHardwareGeneric.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -127,15 +127,6 @@ AudioStreamIn* AudioHardwareGeneric::openInputStream( 
    return mInput;

    return mInput;

}

}





// DEPRECATED

AudioStreamIn* AudioHardwareGeneric::openInputStream(

        int format, int channelCount, uint32_t sampleRate, status_t *status,

        AudioSystem::audio_in_acoustics acoustic_flags)

{

    return openInputStream(AudioRecord::DEFAULT_INPUT, format, channelCount,

            sampleRate, status, acoustic_flags);

}



void AudioHardwareGeneric::closeInputStream(AudioStreamInGeneric* in) {

void AudioHardwareGeneric::closeInputStream(AudioStreamInGeneric* in) {

    if (in == mInput) mInput = 0;

    if (in == mInput) mInput = 0;

}

}

libs/audioflinger/AudioHardwareGeneric.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -119,13 +119,6 @@ public: 
            status_t *status,

            status_t *status,

            AudioSystem::audio_in_acoustics acoustics);

            AudioSystem::audio_in_acoustics acoustics);





    virtual AudioStreamIn* openInputStream(

            int format,

            int channelCount,

            uint32_t sampleRate,

            status_t *status,

            AudioSystem::audio_in_acoustics acoustics);



            void            closeOutputStream(AudioStreamOutGeneric* out);

            void            closeOutputStream(AudioStreamOutGeneric* out);

            void            closeInputStream(AudioStreamInGeneric* in);

            void            closeInputStream(AudioStreamInGeneric* in);

protected:

protected:

libs/audioflinger/AudioHardwareStub.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -77,15 +77,6 @@ AudioStreamIn* AudioHardwareStub::openInputStream( 
    return 0;

    return 0;

}

}





// DEPRECATED

AudioStreamIn* AudioHardwareStub::openInputStream(

        int format, int channelCount, uint32_t sampleRate, status_t *status,

        AudioSystem::audio_in_acoustics acoustic_flags)

{

    return openInputStream(AudioRecord::DEFAULT_INPUT, format, channelCount,

            sampleRate, status, acoustic_flags);

}



status_t AudioHardwareStub::setVoiceVolume(float volume)

status_t AudioHardwareStub::setVoiceVolume(float volume)

{

{

    return NO_ERROR;

    return NO_ERROR;