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

Commit 04427cbc authored by Colin Cross's avatar Colin Cross
Browse files

Rename SurfaceMediaSource::dump to dumpState 

A method named dump() is already exported by Binder.  The warnings
were hidden by the use of -isystem to include frameworks/av/include.

Bug: 31751828
Test: m -j checkbuild
Change-Id: If460a6efc7c7b108243c3ef068c28619482f599d
Merged-In: If460a6efc7c7b108243c3ef068c28619482f599d
(cherry picked from commit f461f38e)
parent db90a869

include/media/stagefright/SurfaceMediaSource.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -107,8 +107,8 @@ public: 
    void setFrameAvailableListener(const sp<FrameAvailableListener>& listener);

    void setFrameAvailableListener(const sp<FrameAvailableListener>& listener);





    // dump our state in a String

    // dump our state in a String

    void dump(String8& result) const;

    void dumpState(String8& result) const;

    void dump(String8& result, const char* prefix, char* buffer,

    void dumpState(String8& result, const char* prefix, char* buffer,

                                                    size_t SIZE) const;

                                                    size_t SIZE) const;





    // metaDataStoredInVideoBuffers tells the encoder what kind of metadata

    // metaDataStoredInVideoBuffers tells the encoder what kind of metadata

media/libstagefright/SurfaceMediaSource.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -97,13 +97,13 @@ void SurfaceMediaSource::setFrameAvailableListener( 
    mFrameAvailableListener = listener;

    mFrameAvailableListener = listener;

}

}





void SurfaceMediaSource::dump(String8& result) const

void SurfaceMediaSource::dumpState(String8& result) const

{

{

    char buffer[1024];

    char buffer[1024];

    dump(result, "", buffer, 1024);

    dumpState(result, "", buffer, 1024);

}

}





void SurfaceMediaSource::dump(

void SurfaceMediaSource::dumpState(

        String8& result,

        String8& result,

        const char* /* prefix */,

        const char* /* prefix */,

        char* buffer,

        char* buffer,