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

Commit 872ffc26 authored by Shuo Qian's avatar Shuo Qian
Browse files

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

Starting from Android 11, VTS will use "DISABLE_" prefix to disable tests instead of the .xml file. We need to migrate these things.

Test: Treehugger; GoogleTest knowledge; VTS team confirmation
Bug: 152813990
Change-Id: I92616557ae44c2a421ee687d0420f7b7901ba5a9
parent 8438a18c

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+3 −1
Original line number 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_P(RadioHidlTest, getImsiForApp) {

TEST_P(RadioHidlTest, DISABLED_getImsiForApp) {

    serial = GetRandomSerialNumber();



    // 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 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_P(RadioHidlTest, requestShutdown) {

TEST_P(RadioHidlTest, DISABLED_requestShutdown) {

    serial = GetRandomSerialNumber();



    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_P(RadioHidlTest, setAllowedCarriers) {

TEST_P(RadioHidlTest, DISABLED_setAllowedCarriers) {

    serial = GetRandomSerialNumber();

    CarrierRestrictions carriers;

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

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+6 −2
Original line number 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_P(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) {

TEST_P(RadioHidlTest_v1_2, DISABLED_startNetworkScan_GoodRequest1) {

    serial = GetRandomSerialNumber();



    ::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_P(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) {

TEST_P(RadioHidlTest_v1_2, DISABLED_startNetworkScan_GoodRequest2) {

    serial = GetRandomSerialNumber();



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