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

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

Snap for 5663715 from 8943ce08 to qt-c2f2-release 

Change-Id: I50b65df1294273aa6e71971828212a19c1c57922
parents 3f5285bf 8943ce08

graphics/composer/2.2/vts/functional/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ cc_test { 
    // TODO(b/64437680): Assume these libs are always available on the device.

    // TODO(b/64437680): Assume these libs are always available on the device.

    shared_libs: [

    shared_libs: [

        "libfmq",

        "libfmq",

        "libhidlbase",

        "libhidltransport",

        "libhidltransport",

        "libsync",

        "libsync",

    ],

    ],

graphics/composer/2.3/vts/functional/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ cc_test { 
    // TODO(b/64437680): Assume these libs are always available on the device.

    // TODO(b/64437680): Assume these libs are always available on the device.

    shared_libs: [

    shared_libs: [

        "libfmq",

        "libfmq",

        "libhidlbase",

        "libhidltransport",

        "libhidltransport",

        "libsync",

        "libsync",

    ],

    ],

health/storage/1.0/vts/functional/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,8 @@ cc_test { 
    srcs: ["VtsHalHealthStorageV1_0TargetTest.cpp"],

    srcs: ["VtsHalHealthStorageV1_0TargetTest.cpp"],

    static_libs: ["android.hardware.health.storage@1.0"],

    static_libs: ["android.hardware.health.storage@1.0"],

    shared_libs: [

    shared_libs: [

        "libhidltransport"

        "libhidlbase",

        "libhidltransport",

    ],

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

}

}

radio/config/1.1/vts/functional/radio_config_hidl_hal_api.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -130,7 +130,8 @@ TEST_F(RadioConfigHidlTest, setPreferredDataModem) { 
    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);

    EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);

    EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);

    EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);

    ALOGI("getModemsConfig, rspInfo.error = %s\n", toString(radioConfigRsp->rspInfo.error).c_str());

    ALOGI("setPreferredDataModem, rspInfo.error = %s\n",

          toString(radioConfigRsp->rspInfo.error).c_str());





    ASSERT_TRUE(CheckAnyOfErrors(

    ASSERT_TRUE(CheckAnyOfErrors(

            radioConfigRsp->rspInfo.error,

            radioConfigRsp->rspInfo.error,
@@ -149,7 +150,8 @@ TEST_F(RadioConfigHidlTest, setPreferredDataModem_invalidArgument) { 
    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);

    EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);

    EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);

    EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);

    ALOGI("getModemsConfig, rspInfo.error = %s\n", toString(radioConfigRsp->rspInfo.error).c_str());

    ALOGI("setPreferredDataModem, rspInfo.error = %s\n",

          toString(radioConfigRsp->rspInfo.error).c_str());





    ASSERT_TRUE(CheckAnyOfErrors(radioConfigRsp->rspInfo.error,

    ASSERT_TRUE(CheckAnyOfErrors(radioConfigRsp->rspInfo.error,

                                 {RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE,

                                 {RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE,

radio/config/1.1/vts/functional/radio_config_hidl_hal_test.cpp

+1 −4
Original line number Original line Diff line number Diff line
@@ -34,9 +34,6 @@ void RadioConfigHidlTest::SetUp() { 
    count_ = 0;

    count_ = 0;





    radioConfig->setResponseFunctions(radioConfigRsp, nullptr);

    radioConfig->setResponseFunctions(radioConfigRsp, nullptr);

    EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);

    EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);

    EXPECT_EQ(RadioError::NONE, radioConfigRsp->rspInfo.error);

}

}





/*

/*