From 5fa1223322175356e6ac943cb06d8b1e1cfc39d9 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 Merged-in: Iafc64da43032d5d9d84b64640e70d93fd7051bcf Change-Id: Iafc64da43032d5d9d84b64640e70d93fd7051bcf --- 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 a6a971282e..5d2e5cffd8 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -235,11 +235,11 @@ status_t ConsumerBase::setDefaultBufferDataSpace( return mConsumer->setDefaultBufferDataSpace(defaultDataSpace); } -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); } @@ -248,7 +248,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