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

Commit 8efc78d4 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Use String8/16 c_str [surfaceflinger]" into aosp-main-future

parents 33d11c93 d9a5b6c3

services/surfaceflinger/tests/unittests/SurfaceFlinger_CreateDisplayTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ public: 
        const auto& display = getCurrentDisplayState(displayToken);

        const auto& display = getCurrentDisplayState(displayToken);

        EXPECT_TRUE(display.isVirtual());

        EXPECT_TRUE(display.isVirtual());

        EXPECT_EQ(display.requestedRefreshRate, Fps::fromValue(requestedRefreshRate));

        EXPECT_EQ(display.requestedRefreshRate, Fps::fromValue(requestedRefreshRate));

        EXPECT_EQ(name.string(), display.displayName);

        EXPECT_EQ(name.c_str(), display.displayName);





        std::optional<VirtualDisplayId> vid =

        std::optional<VirtualDisplayId> vid =

                DisplayId::fromValue<VirtualDisplayId>(displayId | DisplayId::FLAG_VIRTUAL);

                DisplayId::fromValue<VirtualDisplayId>(displayId | DisplayId::FLAG_VIRTUAL);