diff options
author | 2023-08-30 21:50:25 +0000 | |
---|---|---|
committer | 2023-08-30 21:50:25 +0000 | |
commit | be1e4e8d23406f7c1cb8ab50af0ae2697a4f0ec0 (patch) | |
tree | a59c5dffd74845eba2d059d55bfcd65af45af05e /libs/gui/BufferQueueProducer.cpp | |
parent | 1f5a0633594bc1e5a321f0057b9fba3d5fcd849a (diff) | |
parent | 19bcc3a5810fb1c5c0b4f864798d802ac052d24b (diff) |
Merge "Use String8/16 c_str [aosp-main-future]" into aosp-main-future am: 19bcc3a581
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24606011
Change-Id: I3f90ab4c635c1f2c3ee505cf96a29118c57b6e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/BufferQueueProducer.cpp')
-rw-r--r-- | libs/gui/BufferQueueProducer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp index cf5ad7b54f..ce5d5d382e 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -505,13 +505,13 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou { if (CC_UNLIKELY(ATRACE_ENABLED())) { if (buffer == nullptr) { - ATRACE_FORMAT_INSTANT("%s buffer reallocation: null", mConsumerName.string()); + ATRACE_FORMAT_INSTANT("%s buffer reallocation: null", mConsumerName.c_str()); } else { ATRACE_FORMAT_INSTANT("%s buffer reallocation actual %dx%d format:%d " "layerCount:%d " "usage:%d requested: %dx%d format:%d layerCount:%d " "usage:%d ", - mConsumerName.string(), width, height, format, + mConsumerName.c_str(), width, height, format, BQ_LAYER_COUNT, usage, buffer->getWidth(), buffer->getHeight(), buffer->getPixelFormat(), buffer->getLayerCount(), buffer->getUsage()); |