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

Commit 219df2fd authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Rename dump methods to dumpState" 

am: c72b9a3c

Change-Id: I41cc42a6838c6e42bf257d8304f99d5ca8d74ab0
parents 19813466 c72b9a3c

include/gui/BufferQueueConsumer.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public: 
    virtual sp<NativeHandle> getSidebandStream() const;



    // 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.

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

include/gui/BufferQueueCore.h

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


private:

    // 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

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

include/gui/ConsumerBase.h

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

    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

    // called by these methods after locking the mutex.

    void dump(String8& result) const;

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

    void dumpState(String8& result) const;

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



    // setFrameAvailableListener sets the listener object that will be notified

    // when a new frame becomes available.

include/gui/IGraphicBufferConsumer.h

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public: 
    virtual sp<NativeHandle> getSidebandStream() const = 0;



    // 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:

    DECLARE_META_INTERFACE(GraphicBufferConsumer)

libs/gui/BufferQueueConsumer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ sp<NativeHandle> BufferQueueConsumer::getSidebandStream() const { 
    return mCore->mSidebandStream;

}



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

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

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

    const pid_t pid = ipc->getCallingPid();

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

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

    } else {

        mCore->dump(result, prefix);

        mCore->dumpState(result, prefix);

    }

}