| commit | 0c1f99050b7e3169c7eea207e77ffce32dcbcaf2 | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Wed Dec 06 18:41:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 06 18:41:44 2023 +0000 |
| tree | 3f9cc2f6102b514e6245a1bf28c6a3734efa6486 | |
| parent | 6adde184668c2db5fe7cee746babbe08857f6d2c [diff] | |
| parent | 7a9ed3764d4dda00bc9e117025f887e769e8f141 [diff] |
Merge "Fix -Wunused-variable compiler warning" into main am: f837fd0a65 am: 7a9ed3764d Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2861403 Change-Id: I662c6f1dfc293a9efc1f1eccfdbbc7b584cc6ae9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/tests/unittests/SurfaceFlinger_DisplayTransactionCommitTest.cpp b/services/surfaceflinger/tests/unittests/SurfaceFlinger_DisplayTransactionCommitTest.cpp index 94d517a..b620830 100644 --- a/services/surfaceflinger/tests/unittests/SurfaceFlinger_DisplayTransactionCommitTest.cpp +++ b/services/surfaceflinger/tests/unittests/SurfaceFlinger_DisplayTransactionCommitTest.cpp
@@ -110,7 +110,7 @@ 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;