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/BufferQueueConsumer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/gui/BufferQueueConsumer.cpp') diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp index fc53dbdc95..7fbf312727 100644 --- a/libs/gui/BufferQueueConsumer.cpp +++ b/libs/gui/BufferQueueConsumer.cpp @@ -732,7 +732,7 @@ status_t BufferQueueConsumer::discardFreeBuffers() { 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 pid_t pid = ipc->getCallingPid(); const uid_t uid = ipc->getCallingUid(); @@ -744,7 +744,7 @@ void BufferQueueConsumer::dump(String8& result, const char* prefix) const { android_errorWriteWithInfoLog(0x534e4554, "27046057", static_cast(uid), NULL, 0); } else { - mCore->dump(result, prefix); + mCore->dumpState(result, prefix); } } -- cgit v1.2.3-59-g8ed1b