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

Commit d312f177 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle the empty display information" into rvc-qpr-dev am: be5dec42 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12746598

Change-Id: Ia7824e93695383e09a58cbf2fc2959f58929ef11
parents 659769bf be5dec42

automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp

+6 −1
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ using ::android::hardware::automotive::evs::V1_1::BufferDesc; 
using ::android::hardware::automotive::evs::V1_0::DisplayDesc;

using ::android::hardware::automotive::evs::V1_0::DisplayState;

using ::android::hardware::graphics::common::V1_0::PixelFormat;

using ::android::frameworks::automotive::display::V1_0::HwDisplayConfig;

using ::android::frameworks::automotive::display::V1_0::HwDisplayState;

using IEvsCamera_1_0 = ::android::hardware::automotive::evs::V1_0::IEvsCamera;

using IEvsCamera_1_1 = ::android::hardware::automotive::evs::V1_1::IEvsCamera;

using IEvsDisplay_1_0 = ::android::hardware::automotive::evs::V1_0::IEvsDisplay;
@@ -605,7 +607,10 @@ TEST_P(EvsHidlTest, CameraToDisplayRoundTrip) { 
    LOG(INFO) << "Display " << targetDisplayId << " is alreay in use.";



    // Get the display descriptor

    pDisplay->getDisplayInfo_1_1([](const auto& config, const auto& state) {

    pDisplay->getDisplayInfo_1_1([](const HwDisplayConfig& config, const HwDisplayState& state) {

        ASSERT_GT(config.size(), 0);

        ASSERT_GT(state.size(), 0);



        android::DisplayConfig* pConfig = (android::DisplayConfig*)config.data();

        const auto width = pConfig->resolution.getWidth();

        const auto height = pConfig->resolution.getHeight();