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

Commit 42e893d8 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Fix -Wunused-variable compiler warning" into main am: f837fd0a am:... 

Merge "Fix -Wunused-variable compiler warning" into main am: f837fd0a am: 7a9ed376 am: 0c1f9905

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



Change-Id: I1b0426aebe691e5b2f17b48cef7c1a8f0dfed9a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2e3bea5 0c1f9905

services/surfaceflinger/tests/unittests/SurfaceFlinger_DisplayTransactionCommitTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void DisplayTransactionCommitTest::verifyDisplayIsConnected(const sp<IBinder>& d 
    EXPECT_EQ(static_cast<bool>(Case::Display::PRIMARY), display.isPrimary());



    std::optional<DisplayDeviceState::Physical> expectedPhysical;

    if (const auto connectionType = Case::Display::CONNECTION_TYPE::value) {

    if (Case::Display::CONNECTION_TYPE::value) {

        const auto displayId = PhysicalDisplayId::tryCast(Case::Display::DISPLAY_ID::get());

        ASSERT_TRUE(displayId);

        const auto hwcDisplayId = Case::Display::HWC_DISPLAY_ID_OPT::value;