| commit | 708e60d2d6493e4f5469086cd3bc932f0720333d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Sep 01 14:40:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 01 14:40:20 2023 +0000 |
| tree | be456fdd33a7ef9221cd4b93a9d0290d17d840ba | |
| parent | 030aa9f62bb6f3c684224de9a44792d42b0e45f3 [diff] | |
| parent | b98621fb4e0719a8b06394e2462ceb801ad91f45 [diff] |
Merge "Use String8/16 c_str [surfaceflinger]" into udc-dev-plus-aosp am: a988dbd699 am: b98621fb4e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24613969 Change-Id: I973f20cb68ee0a6059b534a390993848f5d9aea5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/tests/unittests/SurfaceFlinger_CreateDisplayTest.cpp b/services/surfaceflinger/tests/unittests/SurfaceFlinger_CreateDisplayTest.cpp index dbf0cd8..28162f4 100644 --- a/services/surfaceflinger/tests/unittests/SurfaceFlinger_CreateDisplayTest.cpp +++ b/services/surfaceflinger/tests/unittests/SurfaceFlinger_CreateDisplayTest.cpp
@@ -47,7 +47,7 @@ const auto& display = getCurrentDisplayState(displayToken); EXPECT_TRUE(display.isVirtual()); EXPECT_EQ(display.requestedRefreshRate, Fps::fromValue(requestedRefreshRate)); - EXPECT_EQ(name.string(), display.displayName); + EXPECT_EQ(name.c_str(), display.displayName); std::optional<VirtualDisplayId> vid = DisplayId::fromValue<VirtualDisplayId>(displayId | DisplayId::FLAG_VIRTUAL);