Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8183ff9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [surfaceflinger]" into udc-dev-plus-aosp am:... 

Merge "Use String8/16 c_str [surfaceflinger]" into udc-dev-plus-aosp am: a988dbd6 am: b98621fb am: 708e60d2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24613969



Change-Id: Iaa169ea6fd1c06ea4470b3fdc507b4d7d664993e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6cd4e62e 708e60d2

services/surfaceflinger/tests/unittests/SurfaceFlinger_CreateDisplayTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public: 
        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);