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

Commit 15a6209b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6554163 from 1b8b7cd7 to mainline-release 

Change-Id: Iee89743cafd3c935d624c76035592e584ba52e56
parents c4be9794 1b8b7cd7

bluetooth/1.0/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ cc_test { 
        "general-tests",

        "vts",

    ],

    disable_framework: true,

}

graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp

+8 −5
Original line number Diff line number Diff line
@@ -414,12 +414,9 @@ void GraphicsComposerHidlCommandTest::sendRefreshFrame(const VsyncPeriodChangeTi 


    mWriter->validateDisplay();

    execute();

    if (mReader->mCompositionChanges.size() != 0) {

        GTEST_SUCCEED() << "Composition change requested, skipping test";

        return;

    }



    ASSERT_EQ(0, mReader->mErrors.size());

    mReader->mCompositionChanges.clear();



    mWriter->presentDisplay();

    execute();

    ASSERT_EQ(0, mReader->mErrors.size());
@@ -427,8 +424,14 @@ void GraphicsComposerHidlCommandTest::sendRefreshFrame(const VsyncPeriodChangeTi 
    mWriter->selectLayer(layer);

    auto handle2 = allocate();

    ASSERT_NE(nullptr, handle2);



    mWriter->setLayerBuffer(0, handle2, -1);

    mWriter->setLayerSurfaceDamage(std::vector<IComposerClient::Rect>(1, {0, 0, 10, 10}));

    mWriter->validateDisplay();

    execute();

    ASSERT_EQ(0, mReader->mErrors.size());

    mReader->mCompositionChanges.clear();



    mWriter->presentDisplay();

    execute();

}

radio/1.0/vts/functional/vts_hal_sap_target_test.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    <target_preparer class="com.android.tradefed.targetprep.MultiSimPreparer" />

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />



    <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup"/>



    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="VtsHalSapV1_0TargetTest->/data/local/tmp/VtsHalSapV1_0TargetTest" />