diff options
| author | 2023-08-18 16:37:50 +0000 | |
|---|---|---|
| committer | 2023-08-18 16:37:50 +0000 | |
| commit | 1624ad4632c599b75497f73e6d0cf940452c37b5 (patch) | |
| tree | 401801d6673ca4b40c780c3e305bd1ecbeace8c5 /libs | |
| parent | 6caa7cbbec81b2304fea3a98950d202002e98ac1 (diff) | |
| parent | ddf7338570f22e3aed340d2244676251f24ae6cb (diff) | |
Merge "Use String8/16 c_str [graphics]" into main am: 9ba8706bbf am: ddf7338570
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2715835
Change-Id: I58315da41fde151f8bba7bf274c6bbd8092092ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/RenderNode.h | 2 | ||||
| -rw-r--r-- | libs/hwui/pipeline/skia/SkiaPipeline.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h index d1e04adcb642..d27c428ca8c3 100644 --- a/libs/hwui/RenderNode.h +++ b/libs/hwui/RenderNode.h @@ -114,7 +114,7 @@ public: return mDisplayList.containsProjectionReceiver(); } - const char* getName() const { return mName.string(); } + const char* getName() const { return mName.c_str(); } void setName(const char* name) { if (name) { diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp index b020e966e05a..cb23bcc166c8 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp @@ -200,7 +200,7 @@ bool SkiaPipeline::createOrUpdateLayer(RenderNode* node, const DamageAccumulator String8 cachesOutput; mRenderThread.cacheManager().dumpMemoryUsage(cachesOutput, &mRenderThread.renderState()); - ALOGE("%s", cachesOutput.string()); + ALOGE("%s", cachesOutput.c_str()); if (errorHandler) { std::ostringstream err; err << "Unable to create layer for " << node->getName(); diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index eb28c080c056..0dea941c91f9 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -357,7 +357,7 @@ void RenderThread::dumpGraphicsMemory(int fd, bool includeProfileData) { String8 cachesOutput; mCacheManager->dumpMemoryUsage(cachesOutput, mRenderState); - dprintf(fd, "\nPipeline=%s\n%s\n", pipelineToString(), cachesOutput.string()); + dprintf(fd, "\nPipeline=%s\n%s\n", pipelineToString(), cachesOutput.c_str()); } void RenderThread::getMemoryUsage(size_t* cpuUsage, size_t* gpuUsage) { |