summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-04-13 20:30:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-13 20:30:49 +0000
commit1b47dfd74909803eecb96e9e8a2695eebcc430a7 (patch)
treea726a19e283ff4ee51276f6797baf3a62e5a4927 /libs/gui/ConsumerBase.cpp
parent3a717993fa5a3abb6ddd9a5ad8ac11599d26287b (diff)
parent4b5fbdb107cf25bf0cad040a63cf51399ce9215b (diff)
Merge changes Ica5f5f5c,Ifb7d2cec,Ia402b4bc,I9c3b6b7e,I36ba19c7, ... into oc-dev
* changes: libgui: Make IGraphicBufferConsumer a SafeInterface libbinder: Add vector<Parcelable> to SafeInterface libbinder: Add sp<NativeHandle> to SafeInterface libbinder: Support enums in SafeInterface libbinder: Support sp<Flattenable> in SafeInterface libbinder: Add int64_t/uint64_t to SafeInterface libgui: Normalize IGraphicBufferConsumer methods libgui: Format IGraphicBufferConsumer
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
-rw-r--r--libs/gui/ConsumerBase.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index d4e4dc3616..1783561928 100644
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@@ -270,7 +270,9 @@ void ConsumerBase::dumpLocked(String8& result, const char* prefix) const {
result.appendFormat("%smAbandoned=%d\n", prefix, int(mAbandoned));
if (!mAbandoned) {
- mConsumer->dumpState(result, prefix);
+ String8 consumerState;
+ mConsumer->dumpState(String8(prefix), &consumerState);
+ result.append(consumerState);
}
}