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

Commit dc782511 authored by Colin Cross's avatar Colin Cross
Browse files

Rename dump methods to dumpState 

The dump methods shadow the IBinder dump method.  The warnings were being
hidden by the use of -isystem to include frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
(cherry picked from commit 3d1d280f)
parent 6e7e2b44

include/gui/BufferQueueConsumer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ public: 
    virtual status_t discardFreeBuffers() override;

    virtual status_t discardFreeBuffers() override;





    // dump our state in a String

    // dump our state in a String

    virtual void dump(String8& result, const char* prefix) const;

    virtual void dumpState(String8& result, const char* prefix) const;





    // Functions required for backwards compatibility.

    // Functions required for backwards compatibility.

    // These will be modified/renamed in IGraphicBufferConsumer and will be

    // These will be modified/renamed in IGraphicBufferConsumer and will be

include/gui/BufferQueueCore.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ public: 




private:

private:

    // Dump our state in a string

    // Dump our state in a string

    void dump(String8& result, const char* prefix) const;

    void dumpState(String8& result, const char* prefix) const;





    // getMinUndequeuedBufferCountLocked returns the minimum number of buffers

    // getMinUndequeuedBufferCountLocked returns the minimum number of buffers

    // that must remain in a state other than DEQUEUED. The async parameter

    // that must remain in a state other than DEQUEUED. The async parameter

include/gui/ConsumerBase.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -63,11 +63,11 @@ public: 
    // log messages.

    // log messages.

    void setName(const String8& name);

    void setName(const String8& name);





    // dump writes the current state to a string. Child classes should add

    // dumpState writes the current state to a string. Child classes should add

    // their state to the dump by overriding the dumpLocked method, which is

    // their state to the dump by overriding the dumpLocked method, which is

    // called by these methods after locking the mutex.

    // called by these methods after locking the mutex.

    void dump(String8& result) const;

    void dumpState(String8& result) const;

    void dump(String8& result, const char* prefix) const;

    void dumpState(String8& result, const char* prefix) const;





    // setFrameAvailableListener sets the listener object that will be notified

    // setFrameAvailableListener sets the listener object that will be notified

    // when a new frame becomes available.

    // when a new frame becomes available.

include/gui/IGraphicBufferConsumer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -278,7 +278,7 @@ public: 
    virtual status_t discardFreeBuffers() = 0;

    virtual status_t discardFreeBuffers() = 0;





    // dump state into a string

    // dump state into a string

    virtual void dump(String8& result, const char* prefix) const = 0;

    virtual void dumpState(String8& result, const char* prefix) const = 0;





public:

public:

    DECLARE_META_INTERFACE(GraphicBufferConsumer)

    DECLARE_META_INTERFACE(GraphicBufferConsumer)

libs/gui/BufferQueueConsumer.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -732,7 +732,7 @@ status_t BufferQueueConsumer::discardFreeBuffers() { 
    return NO_ERROR;

    return NO_ERROR;

}

}





void BufferQueueConsumer::dump(String8& result, const char* prefix) const {

void BufferQueueConsumer::dumpState(String8& result, const char* prefix) const {

    const IPCThreadState* ipc = IPCThreadState::self();

    const IPCThreadState* ipc = IPCThreadState::self();

    const pid_t pid = ipc->getCallingPid();

    const pid_t pid = ipc->getCallingPid();

    const uid_t uid = ipc->getCallingUid();

    const uid_t uid = ipc->getCallingUid();
@@ -744,7 +744,7 @@ void BufferQueueConsumer::dump(String8& result, const char* prefix) const { 
        android_errorWriteWithInfoLog(0x534e4554, "27046057",

        android_errorWriteWithInfoLog(0x534e4554, "27046057",

                static_cast<int32_t>(uid), NULL, 0);

                static_cast<int32_t>(uid), NULL, 0);

    } else {

    } else {

        mCore->dump(result, prefix);

        mCore->dumpState(result, prefix);

    }

    }

}

}