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

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

Merge "Starting from Android 11, VTS will use "DISABLE_" prefix to disable... 

Merge "Starting from Android 11, VTS will use "DISABLE_" prefix to disable tests instead of the .xml file. We need to migrate these things." into rvc-dev am: a826b013

Change-Id: If43a0e49df5f279c2e72f4b3d8cc73ec24f7795a
parents 5f0fc364 a826b013

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -177,9 +177,11 @@ TEST_P(RadioHidlTest, changeIccPin2ForApp) { 
}

}





/*

/*

 * The following test is disabled due to b/109889468

 *

 * Test IRadio.getImsiForApp() for the response returned.

 * Test IRadio.getImsiForApp() for the response returned.

 */

 */

TEST_P(RadioHidlTest, getImsiForApp) {

TEST_P(RadioHidlTest, DISABLED_getImsiForApp) {

    serial = GetRandomSerialNumber();

    serial = GetRandomSerialNumber();





    // Check success returned while getting imsi for 3GPP and 3GPP2 apps only

    // Check success returned while getting imsi for 3GPP and 3GPP2 apps only

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -629,9 +629,11 @@ TEST_P(RadioHidlTest, getHardwareConfig) { 
}

}





/*

/*

 * The following test is disabled due to b/64734869

 *

 * Test IRadio.requestShutdown() for the response returned.

 * Test IRadio.requestShutdown() for the response returned.

 */

 */

TEST_P(RadioHidlTest, requestShutdown) {

TEST_P(RadioHidlTest, DISABLED_requestShutdown) {

    serial = GetRandomSerialNumber();

    serial = GetRandomSerialNumber();





    radio->requestShutdown(serial);

    radio->requestShutdown(serial);
@@ -756,9 +758,11 @@ TEST_P(RadioHidlTest, getModemActivityInfo) { 
}

}





/*

/*

 * The following test is disabled due to b/79930549

 *

 * Test IRadio.setAllowedCarriers() for the response returned.

 * Test IRadio.setAllowedCarriers() for the response returned.

 */

 */

TEST_P(RadioHidlTest, setAllowedCarriers) {

TEST_P(RadioHidlTest, DISABLED_setAllowedCarriers) {

    serial = GetRandomSerialNumber();

    serial = GetRandomSerialNumber();

    CarrierRestrictions carriers;

    CarrierRestrictions carriers;

    memset(&carriers, 0, sizeof(carriers));

    memset(&carriers, 0, sizeof(carriers));

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -299,9 +299,11 @@ TEST_P(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { 
}

}





/*

/*

 * The following test is disabled due to b/112206766

 *

 * Test IRadio.startNetworkScan() with valid periodicity

 * Test IRadio.startNetworkScan() with valid periodicity

 */

 */

TEST_P(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) {

TEST_P(RadioHidlTest_v1_2, DISABLED_startNetworkScan_GoodRequest1) {

    serial = GetRandomSerialNumber();

    serial = GetRandomSerialNumber();





    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {
@@ -333,9 +335,11 @@ TEST_P(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { 
}

}





/*

/*

 * The following test is disabled due to b/112206766

 *

 * Test IRadio.startNetworkScan() with valid periodicity and plmns

 * Test IRadio.startNetworkScan() with valid periodicity and plmns

 */

 */

TEST_P(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) {

TEST_P(RadioHidlTest_v1_2, DISABLED_startNetworkScan_GoodRequest2) {

    serial = GetRandomSerialNumber();

    serial = GetRandomSerialNumber();





    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

    ::android::hardware::radio::V1_2::NetworkScanRequest request = {