diff options
| author | 2023-08-18 16:37:49 +0000 | |
|---|---|---|
| committer | 2023-08-18 16:37:49 +0000 | |
| commit | cdbed9933e9b64e07a70d249477155993ec2efdc (patch) | |
| tree | 04d7d5cfbf37e7c7b55f7e21524cd82a9921d120 /libs/ui/Fence.cpp | |
| parent | d08df42298ee136bad678bfb8c4a1e098505aea9 (diff) | |
| parent | 1bcbf26f6c31294962930216798720c389af2561 (diff) | |
Merge "Use String8/16 c_str [graphics]" into udc-dev-plus-aosp am: 1bcbf26f6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24470494
Change-Id: Iaa006d3afad8f2b0c4c238bea574e09ef5f8650b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/ui/Fence.cpp')
| -rw-r--r-- | libs/ui/Fence.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp index cc96f83578..4be0a3a9d9 100644 --- a/libs/ui/Fence.cpp +++ b/libs/ui/Fence.cpp @@ -115,7 +115,7 @@ sp<Fence> Fence::merge(const char* name, const sp<Fence>& f1, sp<Fence> Fence::merge(const String8& name, const sp<Fence>& f1, const sp<Fence>& f2) { - return merge(name.string(), f1, f2); + return merge(name.c_str(), f1, f2); } int Fence::dup() const { |