From dc782511dcaf46c7fa7488391cc27f0d0be354b0 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 26 Sep 2016 18:10:16 -0700 Subject: 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 3d1d280fa3cbc30700f728a4b13e5308315433d3) --- libs/gui/ConsumerBase.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/gui/ConsumerBase.cpp') diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp index a1bdf4a4a1..805a10d1b6 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -254,11 +254,11 @@ status_t ConsumerBase::discardFreeBuffers() { return mConsumer->discardFreeBuffers(); } -void ConsumerBase::dump(String8& result) const { - dump(result, ""); +void ConsumerBase::dumpState(String8& result) const { + dumpState(result, ""); } -void ConsumerBase::dump(String8& result, const char* prefix) const { +void ConsumerBase::dumpState(String8& result, const char* prefix) const { Mutex::Autolock _l(mMutex); dumpLocked(result, prefix); } @@ -267,7 +267,7 @@ void ConsumerBase::dumpLocked(String8& result, const char* prefix) const { result.appendFormat("%smAbandoned=%d\n", prefix, int(mAbandoned)); if (!mAbandoned) { - mConsumer->dump(result, prefix); + mConsumer->dumpState(result, prefix); } } -- cgit v1.2.3-59-g8ed1b