Cleaned up the flag enforce_telephony_feature_mapping
Cleaned up the 24Q3 flag enforce_telephony_feature_mapping
Test: Basic telephony functionality tests
Test: atest EuiccProfileInfoTest
Bug: 297989574
Flag: EXEMPT flag cleanup
Change-Id: I38ab12e21f7b16c9d6f74d8c4184cf05e4e7719c
diff --git a/radio/aidl/vts/radio_config_test.cpp b/radio/aidl/vts/radio_config_test.cpp
index e7214e5..c4a26a3 100644
--- a/radio/aidl/vts/radio_config_test.cpp
+++ b/radio/aidl/vts/radio_config_test.cpp
@@ -54,11 +54,9 @@
* Test IRadioConfig.getHalDeviceCapabilities() for the response returned.
*/
TEST_P(RadioConfigTest, getHalDeviceCapabilities) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping getHalDeviceCapabilities "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping getHalDeviceCapabilities "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
@@ -73,11 +71,9 @@
* Test IRadioConfig.getSimSlotsStatus() for the response returned.
*/
TEST_P(RadioConfigTest, getSimSlotsStatus) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping getSimSlotsStatus "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping getSimSlotsStatus "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -92,11 +88,9 @@
* Test IRadioConfig.getPhoneCapability() for the response returned.
*/
TEST_P(RadioConfigTest, getPhoneCapability) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping getPhoneCapability "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping getPhoneCapability "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
@@ -125,11 +119,9 @@
* Test IRadioConfig.getSimultaneousCallingSupport() for the response returned.
*/
TEST_P(RadioConfigTest, getSimultaneousCallingSupport) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping getSimultaneousCallingSupport "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping getSimultaneousCallingSupport "
+ "due to undefined FEATURE_TELEPHONY";
}
int32_t aidl_version;
@@ -167,11 +159,9 @@
* Test IRadioConfig.setPreferredDataModem() for the response returned.
*/
TEST_P(RadioConfigTest, setPreferredDataModem) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping setPreferredDataModem "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping setPreferredDataModem "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -216,11 +206,9 @@
* Test IRadioConfig.setPreferredDataModem() with invalid arguments.
*/
TEST_P(RadioConfigTest, setPreferredDataModem_invalidArgument) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping setPreferredDataModem_invalidArgument "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping setPreferredDataModem_invalidArgument "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -243,11 +231,9 @@
* Test IRadioConfig.setSimSlotsMapping() for the response returned.
*/
TEST_P(RadioConfigTest, setSimSlotsMapping) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping setSimSlotsMapping "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping setSimSlotsMapping "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
// get slot status and set SIM slots mapping based on the result.
@@ -318,11 +304,9 @@
*/
TEST_P(RadioConfigTest, checkPortInfoExistsAndPortActive) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping checkPortInfoExistsAndPortActive "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping checkPortInfoExistsAndPortActive "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
diff --git a/radio/aidl/vts/radio_data_test.cpp b/radio/aidl/vts/radio_data_test.cpp
index 2aa5508..7de0187 100644
--- a/radio/aidl/vts/radio_data_test.cpp
+++ b/radio/aidl/vts/radio_data_test.cpp
@@ -68,10 +68,8 @@
* Test IRadioData.setupDataCall() for the response returned.
*/
TEST_P(RadioDataTest, setupDataCall) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "setupDataCall : required FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "setupDataCall : required FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -141,11 +139,9 @@
* Test IRadioData.setupDataCall() with osAppId for the response returned.
*/
TEST_P(RadioDataTest, setupDataCall_osAppId) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping setupDataCall_osAppId "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping setupDataCall_osAppId "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -240,11 +236,9 @@
* Test IRadioData.getSlicingConfig() for the response returned.
*/
TEST_P(RadioDataTest, getSlicingConfig) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping getSlicingConfig "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping getSlicingConfig "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -262,11 +256,9 @@
* Test IRadioData.setDataThrottling() for the response returned.
*/
TEST_P(RadioDataTest, setDataThrottling) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping setDataThrottling "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping setDataThrottling "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -347,11 +339,9 @@
* Test IRadioData.setInitialAttachApn() for the response returned.
*/
TEST_P(RadioDataTest, setInitialAttachApn) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping setInitialAttachApn "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping setInitialAttachApn "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -397,11 +387,9 @@
* Test IRadioData.setDataProfile() for the response returned.
*/
TEST_P(RadioDataTest, setDataProfile) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping setDataProfile "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping setDataProfile "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -450,11 +438,9 @@
* Test IRadioData.deactivateDataCall() for the response returned.
*/
TEST_P(RadioDataTest, deactivateDataCall) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping deactivateDataCall "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping deactivateDataCall "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -488,11 +474,9 @@
* Test IRadioData.startKeepalive() for the response returned.
*/
TEST_P(RadioDataTest, startKeepalive) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping startKeepalive "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping startKeepalive "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
std::vector<KeepaliveRequest> requests = {
@@ -593,11 +577,9 @@
* Test IRadioData.stopKeepalive() for the response returned.
*/
TEST_P(RadioDataTest, stopKeepalive) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping stopKeepalive "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping stopKeepalive "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -616,11 +598,9 @@
* Test IRadioData.getDataCallList() for the response returned.
*/
TEST_P(RadioDataTest, getDataCallList) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping getDataCallList "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping getDataCallList "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
@@ -642,11 +622,9 @@
* Test IRadioData.setDataAllowed() for the response returned.
*/
TEST_P(RadioDataTest, setDataAllowed) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
- GTEST_SKIP() << "Skipping setDataAllowed "
- "due to undefined FEATURE_TELEPHONY_DATA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_DATA)) {
+ GTEST_SKIP() << "Skipping setDataAllowed "
+ "due to undefined FEATURE_TELEPHONY_DATA";
}
serial = GetRandomSerialNumber();
diff --git a/radio/aidl/vts/radio_messaging_test.cpp b/radio/aidl/vts/radio_messaging_test.cpp
index 95e2617..089895f 100644
--- a/radio/aidl/vts/radio_messaging_test.cpp
+++ b/radio/aidl/vts/radio_messaging_test.cpp
@@ -59,11 +59,9 @@
* Test IRadioMessaging.sendSms() for the response returned.
*/
TEST_P(RadioMessagingTest, sendSms) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping sendSms "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping sendSms "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -90,11 +88,9 @@
* Test IRadioMessaging.sendSmsExpectMore() for the response returned.
*/
TEST_P(RadioMessagingTest, sendSmsExpectMore) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping sendSmsExpectMore "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping sendSmsExpectMore "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -120,11 +116,9 @@
* Test IRadioMessaging.sendCdmaSms() for the response returned.
*/
TEST_P(RadioMessagingTest, sendCdmaSms) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping sendCdmaSms "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping sendCdmaSms "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -171,11 +165,9 @@
* Test IRadioMessaging.sendCdmaSmsExpectMore() for the response returned.
*/
TEST_P(RadioMessagingTest, sendCdmaSmsExpectMore) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping sendCdmaSmsExpectMore "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping sendCdmaSmsExpectMore "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -222,11 +214,9 @@
* Test IRadioMessaging.setGsmBroadcastConfig() for the response returned.
*/
TEST_P(RadioMessagingTest, setGsmBroadcastConfig) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping setGsmBroadcastConfig "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping setGsmBroadcastConfig "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -292,11 +282,9 @@
* Test IRadioMessaging.getGsmBroadcastConfig() for the response returned.
*/
TEST_P(RadioMessagingTest, getGsmBroadcastConfig) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping getGsmBroadcastConfig "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping getGsmBroadcastConfig "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -319,11 +307,9 @@
* Test IRadioMessaging.setCdmaBroadcastConfig() for the response returned.
*/
TEST_P(RadioMessagingTest, setCdmaBroadcastConfig) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping setCdmaBroadcastConfig "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping setCdmaBroadcastConfig "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -352,11 +338,9 @@
* Test IRadioMessaging.getCdmaBroadcastConfig() for the response returned.
*/
TEST_P(RadioMessagingTest, getCdmaBroadcastConfig) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping getCdmaBroadcastConfig "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping getCdmaBroadcastConfig "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -377,11 +361,9 @@
* Test IRadioMessaging.setCdmaBroadcastActivation() for the response returned.
*/
TEST_P(RadioMessagingTest, setCdmaBroadcastActivation) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping setCdmaBroadcastActivation "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping setCdmaBroadcastActivation "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -404,11 +386,9 @@
* Test IRadioMessaging.setGsmBroadcastActivation() for the response returned.
*/
TEST_P(RadioMessagingTest, setGsmBroadcastActivation) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping setGsmBroadcastActivation "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping setGsmBroadcastActivation "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -433,11 +413,9 @@
* Test IRadioMessaging.acknowledgeLastIncomingGsmSms() for the response returned.
*/
TEST_P(RadioMessagingTest, acknowledgeLastIncomingGsmSms) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping acknowledgeLastIncomingGsmSms "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping acknowledgeLastIncomingGsmSms "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -461,11 +439,9 @@
* Test IRadioMessaging.acknowledgeIncomingGsmSmsWithPdu() for the response returned.
*/
TEST_P(RadioMessagingTest, acknowledgeIncomingGsmSmsWithPdu) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping acknowledgeIncomingGsmSmsWithPdu "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping acknowledgeIncomingGsmSmsWithPdu "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -489,11 +465,9 @@
* Test IRadioMessaging.acknowledgeLastIncomingCdmaSms() for the response returned.
*/
TEST_P(RadioMessagingTest, acknowledgeLastIncomingCdmaSms) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping acknowledgeIncomingGsmSmsWithPdu "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping acknowledgeIncomingGsmSmsWithPdu "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -520,11 +494,9 @@
* Test IRadioMessaging.sendImsSms() for the response returned.
*/
TEST_P(RadioMessagingTest, sendImsSms) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
- GTEST_SKIP() << "Skipping acknowledgeIncomingGsmSmsWithPdu "
- "due to undefined FEATURE_TELEPHONY_IMS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
+ GTEST_SKIP() << "Skipping acknowledgeIncomingGsmSmsWithPdu "
+ "due to undefined FEATURE_TELEPHONY_IMS";
}
serial = GetRandomSerialNumber();
@@ -577,11 +549,9 @@
* Test IRadioMessaging.getSmscAddress() for the response returned.
*/
TEST_P(RadioMessagingTest, getSmscAddress) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping getSmscAddress "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping getSmscAddress "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -604,11 +574,9 @@
* Test IRadioMessaging.setSmscAddress() for the response returned.
*/
TEST_P(RadioMessagingTest, setSmscAddress) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping setSmscAddress "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping setSmscAddress "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -632,11 +600,9 @@
* Test IRadioMessaging.writeSmsToSim() for the response returned.
*/
TEST_P(RadioMessagingTest, writeSmsToSim) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping writeSmsToSim "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping writeSmsToSim "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -665,11 +631,9 @@
* Test IRadioMessaging.deleteSmsOnSim() for the response returned.
*/
TEST_P(RadioMessagingTest, deleteSmsOnSim) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping deleteSmsOnSim "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping deleteSmsOnSim "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
@@ -695,11 +659,9 @@
* Test IRadioMessaging.writeSmsToRuim() for the response returned.
*/
TEST_P(RadioMessagingTest, writeSmsToRuim) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping writeSmsToRuim "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping writeSmsToRuim "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -753,11 +715,9 @@
* Test IRadioMessaging.deleteSmsOnRuim() for the response returned.
*/
TEST_P(RadioMessagingTest, deleteSmsOnRuim) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping deleteSmsOnRuim "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping deleteSmsOnRuim "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -811,11 +771,9 @@
* Test IRadioMessaging.reportSmsMemoryStatus() for the response returned.
*/
TEST_P(RadioMessagingTest, reportSmsMemoryStatus) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
- GTEST_SKIP() << "Skipping reportSmsMemoryStatus "
- "due to undefined FEATURE_TELEPHONY_MESSAGING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_MESSAGING)) {
+ GTEST_SKIP() << "Skipping reportSmsMemoryStatus "
+ "due to undefined FEATURE_TELEPHONY_MESSAGING";
}
serial = GetRandomSerialNumber();
diff --git a/radio/aidl/vts/radio_modem_test.cpp b/radio/aidl/vts/radio_modem_test.cpp
index 98ea0d2..9fb7db8 100644
--- a/radio/aidl/vts/radio_modem_test.cpp
+++ b/radio/aidl/vts/radio_modem_test.cpp
@@ -68,11 +68,9 @@
* Test IRadioModem.setRadioPower() for the response returned.
*/
TEST_P(RadioModemTest, setRadioPower_emergencyCall_cancelled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setRadioPower_emergencyCall_cancelled "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setRadioPower_emergencyCall_cancelled "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
// Set radio power to off.
@@ -106,11 +104,9 @@
* Test IRadioModem.enableModem() for the response returned.
*/
TEST_P(RadioModemTest, enableModem) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping enableModem "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping enableModem "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
@@ -157,11 +153,9 @@
* Test IRadioModem.getModemStackStatus() for the response returned.
*/
TEST_P(RadioModemTest, getModemStackStatus) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping getModemStackStatus "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping getModemStackStatus "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
@@ -182,11 +176,9 @@
* Test IRadioModem.getBasebandVersion() for the response returned.
*/
TEST_P(RadioModemTest, getBasebandVersion) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping getBasebandVersion "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping getBasebandVersion "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
@@ -205,11 +197,9 @@
* Test IRadioModem.getDeviceIdentity() for the response returned.
*/
TEST_P(RadioModemTest, getDeviceIdentity) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping getDeviceIdentity "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping getDeviceIdentity "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
@@ -298,11 +288,9 @@
* Test IRadioModem.nvWriteCdmaPrl() for the response returned.
*/
TEST_P(RadioModemTest, nvWriteCdmaPrl) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping nvWriteCdmaPrl "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping nvWriteCdmaPrl "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -342,11 +330,9 @@
* Test IRadioModem.getHardwareConfig() for the response returned.
*/
TEST_P(RadioModemTest, getHardwareConfig) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping getHardwareConfig "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping getHardwareConfig "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
@@ -368,11 +354,9 @@
* Test IRadioModem.requestShutdown() for the response returned.
*/
TEST_P(RadioModemTest, DISABLED_requestShutdown) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping DISABLED_requestShutdown "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping DISABLED_requestShutdown "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -392,11 +376,9 @@
* Test IRadioModem.getRadioCapability() for the response returned.
*/
TEST_P(RadioModemTest, getRadioCapability) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getRadioCapability "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getRadioCapability "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -415,11 +397,9 @@
* Test IRadioModem.setRadioCapability() for the response returned.
*/
TEST_P(RadioModemTest, setRadioCapability) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setRadioCapability "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setRadioCapability "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
@@ -443,11 +423,9 @@
* Test IRadioModem.getModemActivityInfo() for the response returned.
*/
TEST_P(RadioModemTest, getModemActivityInfo) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getModemActivityInfo "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getModemActivityInfo "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -467,11 +445,9 @@
* Test IRadioModem.sendDeviceState() for the response returned.
*/
TEST_P(RadioModemTest, sendDeviceState) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping sendDeviceState "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping sendDeviceState "
+ "due to undefined FEATURE_TELEPHONY";
}
serial = GetRandomSerialNumber();
diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp
index 439d268..5c1955a 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -98,11 +98,9 @@
* for the response returned.
*/
TEST_P(RadioNetworkTest, setGetAllowedNetworkTypesBitmap) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setGetAllowedNetworkTypesBitmap "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setGetAllowedNetworkTypesBitmap "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -167,11 +165,9 @@
* Test IRadioNetwork.setNrDualConnectivityState() for the response returned.
*/
TEST_P(RadioNetworkTest, setNrDualConnectivityState) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setNrDualConnectivityState "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setNrDualConnectivityState "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -198,11 +194,9 @@
* Test IRadioNetwork.isNrDualConnectivityEnabled() for the response returned.
*/
TEST_P(RadioNetworkTest, isNrDualConnectivityEnabled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping isNrDualConnectivityEnabled "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping isNrDualConnectivityEnabled "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -243,11 +237,9 @@
* Verify that the usage setting can be retrieved.
*/
TEST_P(RadioNetworkTest, getUsageSetting) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping getUsageSetting "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping getUsageSetting "
+ "due to undefined FEATURE_TELEPHONY";
}
invokeAndExpectResponse([&](int serial) { return radio_network->getUsageSetting(serial); },
@@ -289,11 +281,9 @@
* -That the usage setting cannot be set to invalid values.
*/
TEST_P(RadioNetworkTest, setUsageSetting) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
- GTEST_SKIP() << "Skipping setUsageSetting "
- "due to undefined FEATURE_TELEPHONY";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY)) {
+ GTEST_SKIP() << "Skipping setUsageSetting "
+ "due to undefined FEATURE_TELEPHONY";
}
invokeAndExpectResponse([&](int serial) { return radio_network->getUsageSetting(serial); },
@@ -358,11 +348,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() with invalid hysteresisDb
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_invalidHysteresisDb) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_invalidHysteresisDb "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_invalidHysteresisDb "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -391,11 +379,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() with empty thresholds
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_EmptyThresholds) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_EmptyThresholds "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_EmptyThresholds "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -423,11 +409,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for GERAN
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Geran) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Geran "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Geran "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -457,11 +441,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for UTRAN
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Utran_Rscp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Utran_Rscp "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Utran_Rscp "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -490,11 +472,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for UTRAN
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Utran_Ecno) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Utran_Ecno "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Utran_Ecno "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -524,11 +504,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for EUTRAN
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Eutran_RSRP) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Eutran_RSRP "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Eutran_RSRP "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -557,11 +535,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for EUTRAN
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Eutran_RSRQ) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Eutran_RSRQ "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Eutran_RSRQ "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -590,11 +566,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for EUTRAN
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Eutran_RSSNR) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Eutran_RSSNR "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Eutran_RSSNR "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -619,11 +593,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for CDMA2000
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Cdma2000) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Cdma2000 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Cdma2000 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
@@ -657,11 +629,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for NGRAN_SSRSRP
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_NGRAN_SSRSRP) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_NGRAN_SSRSRP "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_NGRAN_SSRSRP "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -694,11 +664,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for NGRAN_SSRSRQ
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_NGRAN_SSRSRQ) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_NGRAN_SSRSRQ "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_NGRAN_SSRSRQ "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -731,11 +699,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for EUTRAN
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Disable_RSSNR) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Disable_RSSNR "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_Disable_RSSNR "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -760,11 +726,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for NGRAN_SSSINR
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_NGRAN_SSSINR) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_NGRAN_SSSINR "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_NGRAN_SSSINR "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -797,11 +761,9 @@
* Test IRadioNetwork.setSignalStrengthReportingCriteria() for multi-RANs per request
*/
TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_multiRansPerRequest) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_multiRansPerRequest "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSignalStrengthReportingCriteria_multiRansPerRequest "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
SignalThresholdInfo signalThresholdInfoGeran;
@@ -890,11 +852,9 @@
* Test IRadioNetwork.setLinkCapacityReportingCriteria() invalid hysteresisDlKbps
*/
TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_invalidHysteresisDlKbps) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setLinkCapacityReportingCriteria_invalidHysteresisDlKbps "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setLinkCapacityReportingCriteria_invalidHysteresisDlKbps "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -917,11 +877,9 @@
* Test IRadioNetwork.setLinkCapacityReportingCriteria() invalid hysteresisUlKbps
*/
TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_invalidHysteresisUlKbps) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setLinkCapacityReportingCriteria_invalidHysteresisUlKbps "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setLinkCapacityReportingCriteria_invalidHysteresisUlKbps "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -943,11 +901,9 @@
* Test IRadioNetwork.setLinkCapacityReportingCriteria() empty params
*/
TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_emptyParams) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setLinkCapacityReportingCriteria_emptyParams "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setLinkCapacityReportingCriteria_emptyParams "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -968,11 +924,9 @@
* Test IRadioNetwork.setLinkCapacityReportingCriteria() for GERAN
*/
TEST_P(RadioNetworkTest, setLinkCapacityReportingCriteria_Geran) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setLinkCapacityReportingCriteria_Geran "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setLinkCapacityReportingCriteria_Geran "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -997,11 +951,9 @@
* Test IRadioNetwork.setSystemSelectionChannels() for the response returned.
*/
TEST_P(RadioNetworkTest, setSystemSelectionChannels) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setSystemSelectionChannels "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setSystemSelectionChannels "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1047,11 +999,9 @@
* Test IRadioNetwork.startNetworkScan() for the response returned.
*/
TEST_P(RadioNetworkTest, startNetworkScan) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1096,11 +1046,9 @@
* Test IRadioNetwork.startNetworkScan() with invalid specifier.
*/
TEST_P(RadioNetworkTest, startNetworkScan_InvalidArgument) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_InvalidArgument "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_InvalidArgument "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
// get aidl version
@@ -1169,11 +1117,9 @@
* Test IRadioNetwork.startNetworkScan() with invalid interval (lower boundary).
*/
TEST_P(RadioNetworkTest, startNetworkScan_InvalidInterval1) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_InvalidInterval1 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_InvalidInterval1 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1205,11 +1151,9 @@
* Test IRadioNetwork.startNetworkScan() with invalid interval (upper boundary).
*/
TEST_P(RadioNetworkTest, startNetworkScan_InvalidInterval2) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_InvalidInterval2 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_InvalidInterval2 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1241,11 +1185,9 @@
* Test IRadioNetwork.startNetworkScan() with invalid max search time (lower boundary).
*/
TEST_P(RadioNetworkTest, startNetworkScan_InvalidMaxSearchTime1) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_InvalidMaxSearchTime1 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_InvalidMaxSearchTime1 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1277,11 +1219,9 @@
* Test IRadioNetwork.startNetworkScan() with invalid max search time (upper boundary).
*/
TEST_P(RadioNetworkTest, startNetworkScan_InvalidMaxSearchTime2) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_InvalidMaxSearchTime2 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_InvalidMaxSearchTime2 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1313,11 +1253,9 @@
* Test IRadioNetwork.startNetworkScan() with invalid periodicity (lower boundary).
*/
TEST_P(RadioNetworkTest, startNetworkScan_InvalidPeriodicity1) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_InvalidPeriodicity1 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_InvalidPeriodicity1 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1349,11 +1287,9 @@
* Test IRadioNetwork.startNetworkScan() with invalid periodicity (upper boundary).
*/
TEST_P(RadioNetworkTest, startNetworkScan_InvalidPeriodicity2) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_InvalidPeriodicity2 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_InvalidPeriodicity2 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1385,11 +1321,9 @@
* Test IRadioNetwork.startNetworkScan() with valid periodicity
*/
TEST_P(RadioNetworkTest, startNetworkScan_GoodRequest1) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_GoodRequest1 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_GoodRequest1 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1426,11 +1360,9 @@
* Test IRadioNetwork.startNetworkScan() with valid periodicity and plmns
*/
TEST_P(RadioNetworkTest, startNetworkScan_GoodRequest2) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping startNetworkScan_GoodRequest2 "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping startNetworkScan_GoodRequest2 "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1468,11 +1400,9 @@
* Test IRadioNetwork.setNetworkSelectionModeManual() for the response returned.
*/
TEST_P(RadioNetworkTest, setNetworkSelectionModeManual) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setNetworkSelectionModeManual "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setNetworkSelectionModeManual "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1495,11 +1425,9 @@
* Test IRadioNetwork.getBarringInfo() for the response returned.
*/
TEST_P(RadioNetworkTest, getBarringInfo) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getBarringInfo "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getBarringInfo "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1606,11 +1534,9 @@
* Test IRadioNetwork.getSignalStrength() for the response returned.
*/
TEST_P(RadioNetworkTest, getSignalStrength) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getSignalStrength "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getSignalStrength "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1632,11 +1558,9 @@
* Test IRadioNetwork.getCellInfoList() for the response returned.
*/
TEST_P(RadioNetworkTest, getCellInfoList) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getCellInfoList "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getCellInfoList "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1657,11 +1581,9 @@
* Test IRadioNetwork.getVoiceRegistrationState() for the response returned.
*/
TEST_P(RadioNetworkTest, getVoiceRegistrationState) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getVoiceRegistrationState "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getVoiceRegistrationState "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1682,11 +1604,9 @@
* Test IRadioNetwork.getDataRegistrationState() for the response returned.
*/
TEST_P(RadioNetworkTest, getDataRegistrationState) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getDataRegistrationState "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getDataRegistrationState "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1787,11 +1707,9 @@
if (!shouldTestCdma()) {
GTEST_SKIP() << "Skipping CDMA testing (deprecated)";
}
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getAvailableBandModes "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getAvailableBandModes "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1823,11 +1741,9 @@
* Test IRadioNetwork.setIndicationFilter()
*/
TEST_P(RadioNetworkTest, setIndicationFilter) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setIndicationFilter "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setIndicationFilter "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1848,11 +1764,9 @@
* Test IRadioNetwork.setBarringPassword() for the response returned.
*/
TEST_P(RadioNetworkTest, setBarringPassword) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setBarringPassword "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setBarringPassword "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1878,11 +1792,9 @@
* Test IRadioNetwork.setSuppServiceNotifications() for the response returned.
*/
TEST_P(RadioNetworkTest, setSuppServiceNotifications) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping setSuppServiceNotifications "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping setSuppServiceNotifications "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -1904,11 +1816,9 @@
* Test IRadioNetwork.getImsRegistrationState() for the response returned.
*/
TEST_P(RadioNetworkTest, getImsRegistrationState) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
- GTEST_SKIP() << "Skipping getImsRegistrationState "
- "due to undefined FEATURE_TELEPHONY_IMS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
+ GTEST_SKIP() << "Skipping getImsRegistrationState "
+ "due to undefined FEATURE_TELEPHONY_IMS";
}
serial = GetRandomSerialNumber();
@@ -1931,11 +1841,9 @@
* Test IRadioNetwork.getOperator() for the response returned.
*/
TEST_P(RadioNetworkTest, getOperator) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getOperator "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getOperator "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1954,11 +1862,9 @@
* Test IRadioNetwork.getNetworkSelectionMode() for the response returned.
*/
TEST_P(RadioNetworkTest, getNetworkSelectionMode) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getNetworkSelectionMode "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getNetworkSelectionMode "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -1977,11 +1883,9 @@
* Test IRadioNetwork.setNetworkSelectionModeAutomatic() for the response returned.
*/
TEST_P(RadioNetworkTest, setNetworkSelectionModeAutomatic) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setNetworkSelectionModeAutomatic "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setNetworkSelectionModeAutomatic "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -2003,11 +1907,9 @@
* Test IRadioNetwork.getAvailableNetworks() for the response returned.
*/
TEST_P(RadioNetworkTest, getAvailableNetworks) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getAvailableNetworks "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getAvailableNetworks "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -2034,11 +1936,9 @@
if (!shouldTestCdma()) {
GTEST_SKIP() << "Skipping CDMA testing (deprecated)";
}
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setBandMode "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setBandMode "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -2062,11 +1962,9 @@
if (!shouldTestCdma()) {
GTEST_SKIP() << "Skipping testing of deprecated setLocationUpdates method";
}
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setLocationUpdates "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setLocationUpdates "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -2086,11 +1984,9 @@
* Test IRadioNetwork.setCdmaRoamingPreference() for the response returned.
*/
TEST_P(RadioNetworkTest, setCdmaRoamingPreference) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping setCdmaRoamingPreference "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping setCdmaRoamingPreference "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -2111,11 +2007,9 @@
* Test IRadioNetwork.getCdmaRoamingPreference() for the response returned.
*/
TEST_P(RadioNetworkTest, getCdmaRoamingPreference) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping getCdmaRoamingPreference "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping getCdmaRoamingPreference "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -2137,11 +2031,9 @@
* Test IRadioNetwork.getVoiceRadioTechnology() for the response returned.
*/
TEST_P(RadioNetworkTest, getVoiceRadioTechnology) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping getVoiceRadioTechnology "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping getVoiceRadioTechnology "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -2160,11 +2052,9 @@
* Test IRadioNetwork.setCellInfoListRate() for the response returned.
*/
TEST_P(RadioNetworkTest, setCellInfoListRate) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setCellInfoListRate "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setCellInfoListRate "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -2184,11 +2074,9 @@
* Test IRadioNetwork.supplyNetworkDepersonalization() for the response returned.
*/
TEST_P(RadioNetworkTest, supplyNetworkDepersonalization) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping supplyNetworkDepersonalization "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping supplyNetworkDepersonalization "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
serial = GetRandomSerialNumber();
@@ -2211,11 +2099,9 @@
* Test IRadioNetwork.setEmergencyMode() for the response returned.
*/
TEST_P(RadioNetworkTest, setEmergencyMode) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setEmergencyMode "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setEmergencyMode "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
int32_t aidl_version;
@@ -2255,11 +2141,9 @@
* Test IRadioNetwork.triggerEmergencyNetworkScan() for the response returned.
*/
TEST_P(RadioNetworkTest, triggerEmergencyNetworkScan) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping triggerEmergencyNetworkScan "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping triggerEmergencyNetworkScan "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
int32_t aidl_version;
@@ -2317,11 +2201,9 @@
* Test IRadioNetwork.cancelEmergencyNetworkScan() for the response returned.
*/
TEST_P(RadioNetworkTest, cancelEmergencyNetworkScan) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping cancelEmergencyNetworkScan "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping cancelEmergencyNetworkScan "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
int32_t aidl_version;
@@ -2348,11 +2230,9 @@
* Test IRadioNetwork.exitEmergencyMode() for the response returned.
*/
TEST_P(RadioNetworkTest, exitEmergencyMode) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping exitEmergencyMode "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping exitEmergencyMode "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
int32_t aidl_version;
@@ -2379,11 +2259,9 @@
* Test IRadioNetwork.setN1ModeEnabled() for the response returned.
*/
TEST_P(RadioNetworkTest, setN1ModeEnabled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setN1ModeEnabled "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setN1ModeEnabled "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
int32_t aidl_version;
@@ -2418,11 +2296,9 @@
* Test IRadioNetwork.isN1ModeEnabled() for the response returned.
*/
TEST_P(RadioNetworkTest, isN1ModeEnabled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping isN1ModeEnabled "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping isN1ModeEnabled "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
int32_t aidl_version;
@@ -2456,11 +2332,9 @@
* Test IRadioNetwork.setNullCipherAndIntegrityEnabled() for the response returned.
*/
TEST_P(RadioNetworkTest, setNullCipherAndIntegrityEnabled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping setNullCipherAndIntegrityEnabled "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping setNullCipherAndIntegrityEnabled "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
int32_t aidl_version;
@@ -2488,11 +2362,9 @@
* Test IRadioNetwork.isNullCipherAndIntegrityEnabled() for the response returned.
*/
TEST_P(RadioNetworkTest, isNullCipherAndIntegrityEnabled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
- GTEST_SKIP() << "Skipping isNullCipherAndIntegrityEnabled "
- "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {
+ GTEST_SKIP() << "Skipping isNullCipherAndIntegrityEnabled "
+ "due to undefined FEATURE_TELEPHONY_RADIO_ACCESS";
}
int32_t aidl_version;
diff --git a/radio/aidl/vts/radio_sap_test.cpp b/radio/aidl/vts/radio_sap_test.cpp
index 6d283e9..55e5148 100644
--- a/radio/aidl/vts/radio_sap_test.cpp
+++ b/radio/aidl/vts/radio_sap_test.cpp
@@ -85,11 +85,9 @@
* Test ISap.connectReq() for the response returned.
*/
TEST_P(SapTest, connectReq) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping connectReq "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping connectReq "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -110,11 +108,9 @@
* Test ISap.disconnectReq() for the response returned
*/
TEST_P(SapTest, disconnectReq) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping disconnectReq "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping disconnectReq "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -130,11 +126,9 @@
* Test ISap.apduReq() for the response returned.
*/
TEST_P(SapTest, apduReq) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping apduReq "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping apduReq "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -158,11 +152,9 @@
* Test ISap.transferAtrReq() for the response returned.
*/
TEST_P(SapTest, transferAtrReq) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping transferAtrReq "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping transferAtrReq "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -183,11 +175,9 @@
* Test ISap.powerReq() for the response returned.
*/
TEST_P(SapTest, powerReq) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping powerReq "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping powerReq "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -210,11 +200,9 @@
* Test ISap.resetSimReq() for the response returned.
*/
TEST_P(SapTest, resetSimReq) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping resetSimReq "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping resetSimReq "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -236,11 +224,9 @@
* Test ISap.transferCardReaderStatusReq() for the response returned.
*/
TEST_P(SapTest, transferCardReaderStatusReq) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping transferCardReaderStatusReq "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping transferCardReaderStatusReq "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -260,11 +246,9 @@
* Test ISap.setTransferProtocolReq() for the response returned.
*/
TEST_P(SapTest, setTransferProtocolReq) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping setTransferProtocolReq "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping setTransferProtocolReq "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
diff --git a/radio/aidl/vts/radio_sim_test.cpp b/radio/aidl/vts/radio_sim_test.cpp
index aaccb21..138424c 100644
--- a/radio/aidl/vts/radio_sim_test.cpp
+++ b/radio/aidl/vts/radio_sim_test.cpp
@@ -74,11 +74,9 @@
* Test IRadioSim.setSimCardPower() for the response returned.
*/
TEST_P(RadioSimTest, setSimCardPower) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping setSimCardPower "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping setSimCardPower "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
/* Test setSimCardPower power down */
@@ -143,11 +141,9 @@
* Test IRadioSim.setCarrierInfoForImsiEncryption() for the response returned.
*/
TEST_P(RadioSimTest, setCarrierInfoForImsiEncryption) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping setCarrierInfoForImsiEncryption "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping setCarrierInfoForImsiEncryption "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -174,11 +170,9 @@
* Test IRadioSim.getSimPhonebookRecords() for the response returned.
*/
TEST_P(RadioSimTest, getSimPhonebookRecords) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping getSimPhonebookRecords "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping getSimPhonebookRecords "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -204,11 +198,9 @@
* Test IRadioSim.getSimPhonebookCapacity for the response returned.
*/
TEST_P(RadioSimTest, getSimPhonebookCapacity) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping getSimPhonebookCapacity "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping getSimPhonebookCapacity "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -251,11 +243,9 @@
* Test IRadioSim.updateSimPhonebookRecords() for the response returned.
*/
TEST_P(RadioSimTest, updateSimPhonebookRecords) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping updateSimPhonebookRecords "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping updateSimPhonebookRecords "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -322,11 +312,9 @@
* For SIM ABSENT case.
*/
TEST_P(RadioSimTest, togglingUiccApplicationsSimAbsent) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping togglingUiccApplicationsSimAbsent "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping togglingUiccApplicationsSimAbsent "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
// This test case only test SIM ABSENT case.
@@ -356,11 +344,9 @@
* For SIM PRESENT case.
*/
TEST_P(RadioSimTest, togglingUiccApplicationsSimPresent) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping togglingUiccApplicationsSimPresent "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping togglingUiccApplicationsSimPresent "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
// This test case only test SIM ABSENT case.
@@ -410,11 +396,9 @@
* Test IRadioSim.areUiccApplicationsEnabled() for the response returned.
*/
TEST_P(RadioSimTest, areUiccApplicationsEnabled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping areUiccApplicationsEnabled "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping areUiccApplicationsEnabled "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
// Disable Uicc applications.
@@ -437,11 +421,9 @@
* Test IRadioSim.getAllowedCarriers() for the response returned.
*/
TEST_P(RadioSimTest, getAllowedCarriers) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping getAllowedCarriers "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping getAllowedCarriers "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -459,11 +441,9 @@
* Test IRadioSim.setAllowedCarriers() for the response returned.
*/
TEST_P(RadioSimTest, setAllowedCarriers) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping setAllowedCarriers "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping setAllowedCarriers "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -621,11 +601,9 @@
* Test IRadioSim.getIccCardStatus() for the response returned.
*/
TEST_P(RadioSimTest, getIccCardStatus) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping getIccCardStatus "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping getIccCardStatus "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
EXPECT_LE(cardStatus.applications.size(), RadioConst::CARD_MAX_APPS);
@@ -638,11 +616,9 @@
* Test IRadioSim.supplyIccPinForApp() for the response returned
*/
TEST_P(RadioSimTest, supplyIccPinForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping supplyIccPinForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping supplyIccPinForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -670,11 +646,9 @@
* Test IRadioSim.supplyIccPukForApp() for the response returned.
*/
TEST_P(RadioSimTest, supplyIccPukForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping supplyIccPukForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping supplyIccPukForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -702,11 +676,9 @@
* Test IRadioSim.supplyIccPin2ForApp() for the response returned.
*/
TEST_P(RadioSimTest, supplyIccPin2ForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping supplyIccPin2ForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping supplyIccPin2ForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -735,11 +707,9 @@
* Test IRadioSim.supplyIccPuk2ForApp() for the response returned.
*/
TEST_P(RadioSimTest, supplyIccPuk2ForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping supplyIccPuk2ForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping supplyIccPuk2ForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -767,11 +737,9 @@
* Test IRadioSim.changeIccPinForApp() for the response returned.
*/
TEST_P(RadioSimTest, changeIccPinForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping changeIccPinForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping changeIccPinForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -799,11 +767,9 @@
* Test IRadioSim.changeIccPin2ForApp() for the response returned.
*/
TEST_P(RadioSimTest, changeIccPin2ForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping changeIccPin2ForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping changeIccPin2ForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -832,11 +798,9 @@
* Test IRadioSim.getImsiForApp() for the response returned.
*/
TEST_P(RadioSimTest, getImsiForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping getImsiForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping getImsiForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -868,11 +832,9 @@
* Test IRadioSim.iccIoForApp() for the response returned.
*/
TEST_P(RadioSimTest, iccIoForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping iccIoForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping iccIoForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -900,11 +862,9 @@
* Test IRadioSim.iccTransmitApduBasicChannel() for the response returned.
*/
TEST_P(RadioSimTest, iccTransmitApduBasicChannel) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping iccTransmitApduBasicChannel "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping iccTransmitApduBasicChannel "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -922,11 +882,9 @@
* Test IRadioSim.iccOpenLogicalChannel() for the response returned.
*/
TEST_P(RadioSimTest, iccOpenLogicalChannel) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping iccOpenLogicalChannel "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping iccOpenLogicalChannel "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -951,11 +909,9 @@
GTEST_SKIP() << "Skipping iccCloseLogicalChannel (deprecated)";
}
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping iccCloseLogicalChannel "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping iccCloseLogicalChannel "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -972,11 +928,9 @@
* Test IRadioSim.iccCloseLogicalChannelWithSessionInfo() for the response returned.
*/
TEST_P(RadioSimTest, iccCloseLogicalChannelWithSessionInfo) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping iccCloseLogicalChannelWithSessionInfo "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping iccCloseLogicalChannelWithSessionInfo "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
int32_t aidl_version;
@@ -1006,11 +960,9 @@
* Test IRadioSim.iccTransmitApduLogicalChannel() for the response returned.
*/
TEST_P(RadioSimTest, iccTransmitApduLogicalChannel) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping iccTransmitApduLogicalChannel "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping iccTransmitApduLogicalChannel "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -1028,11 +980,9 @@
* Test IRadioSim.requestIccSimAuthentication() for the response returned.
*/
TEST_P(RadioSimTest, requestIccSimAuthentication) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping requestIccSimAuthentication "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping requestIccSimAuthentication "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -1055,11 +1005,9 @@
* Test IRadioSim.getFacilityLockForApp() for the response returned.
*/
TEST_P(RadioSimTest, getFacilityLockForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping getFacilityLockForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping getFacilityLockForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -1085,11 +1033,9 @@
* Test IRadioSim.setFacilityLockForApp() for the response returned.
*/
TEST_P(RadioSimTest, setFacilityLockForApp) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping setFacilityLockForApp "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping setFacilityLockForApp "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -1116,11 +1062,9 @@
* Test IRadioSim.getCdmaSubscription() for the response returned.
*/
TEST_P(RadioSimTest, getCdmaSubscription) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping getCdmaSubscription "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping getCdmaSubscription "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -1141,11 +1085,9 @@
* Test IRadioSim.getCdmaSubscriptionSource() for the response returned.
*/
TEST_P(RadioSimTest, getCdmaSubscriptionSource) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping getCdmaSubscriptionSource "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping getCdmaSubscriptionSource "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -1166,11 +1108,9 @@
* Test IRadioSim.setCdmaSubscriptionSource() for the response returned.
*/
TEST_P(RadioSimTest, setCdmaSubscriptionSource) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping setCdmaSubscriptionSource "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping setCdmaSubscriptionSource "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -1195,11 +1135,9 @@
if (!shouldTestCdma()) {
GTEST_SKIP() << "Skipping CDMA testing (deprecated)";
}
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping setUiccSubscription "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping setUiccSubscription "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -1224,11 +1162,9 @@
* Test IRadioSim.sendEnvelope() for the response returned.
*/
TEST_P(RadioSimTest, sendEnvelope) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping sendEnvelope "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping sendEnvelope "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -1254,11 +1190,9 @@
* Test IRadioSim.sendTerminalResponseToSim() for the response returned.
*/
TEST_P(RadioSimTest, sendTerminalResponseToSim) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping sendTerminalResponseToSim "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping sendTerminalResponseToSim "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -1284,11 +1218,9 @@
* Test IRadioSim.reportStkServiceIsRunning() for the response returned.
*/
TEST_P(RadioSimTest, reportStkServiceIsRunning) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping reportStkServiceIsRunning "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping reportStkServiceIsRunning "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
@@ -1310,11 +1242,9 @@
* string.
*/
TEST_P(RadioSimTest, sendEnvelopeWithStatus) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
- GTEST_SKIP() << "Skipping sendEnvelopeWithStatus "
- "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_SUBSCRIPTION)) {
+ GTEST_SKIP() << "Skipping sendEnvelopeWithStatus "
+ "due to undefined FEATURE_TELEPHONY_SUBSCRIPTION";
}
serial = GetRandomSerialNumber();
diff --git a/radio/aidl/vts/radio_voice_test.cpp b/radio/aidl/vts/radio_voice_test.cpp
index 3b07378..9eb5bac 100644
--- a/radio/aidl/vts/radio_voice_test.cpp
+++ b/radio/aidl/vts/radio_voice_test.cpp
@@ -93,18 +93,9 @@
* Test IRadioVoice.emergencyDial() for the response returned.
*/
TEST_P(RadioVoiceTest, emergencyDial) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping emergencyDial "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
- } else {
- if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
- ALOGI("Skipping emergencyDial because voice call is not supported in device");
- return;
- } else {
- ALOGI("Running emergencyDial because voice call is supported in device");
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping emergencyDial "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -150,18 +141,9 @@
* Test IRadioVoice.emergencyDial() with specified service and its response returned.
*/
TEST_P(RadioVoiceTest, emergencyDial_withServices) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping emergencyDial_withServices "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
- } else {
- if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
- ALOGI("Skipping emergencyDial because voice call is not supported in device");
- return;
- } else {
- ALOGI("Running emergencyDial because voice call is supported in device");
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping emergencyDial_withServices "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -207,18 +189,9 @@
* Test IRadioVoice.emergencyDial() with known emergency call routing and its response returned.
*/
TEST_P(RadioVoiceTest, emergencyDial_withEmergencyRouting) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping emergencyDial_withEmergencyRouting "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
- } else {
- if (!deviceSupportsFeature(FEATURE_VOICE_CALL)) {
- ALOGI("Skipping emergencyDial because voice call is not supported in device");
- return;
- } else {
- ALOGI("Running emergencyDial because voice call is supported in device");
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping emergencyDial_withEmergencyRouting "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -265,11 +238,9 @@
* Test IRadioVoice.getCurrentCalls() for the response returned.
*/
TEST_P(RadioVoiceTest, getCurrentCalls) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getCurrentCalls "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getCurrentCalls "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -284,11 +255,9 @@
* Test IRadioVoice.getClir() for the response returned.
*/
TEST_P(RadioVoiceTest, getClir) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getClir "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getClir "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -309,11 +278,9 @@
* Test IRadioVoice.setClir() for the response returned.
*/
TEST_P(RadioVoiceTest, setClir) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping setClir "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping setClir "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -334,11 +301,9 @@
* Test IRadioVoice.getClip() for the response returned.
*/
TEST_P(RadioVoiceTest, getClip) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getClip "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getClip "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -359,11 +324,9 @@
* Test IRadioVoice.getTtyMode() for the response returned.
*/
TEST_P(RadioVoiceTest, getTtyMode) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getTtyMode "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getTtyMode "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -382,11 +345,9 @@
* Test IRadioVoice.setTtyMode() for the response returned.
*/
TEST_P(RadioVoiceTest, setTtyMode) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping setTtyMode "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping setTtyMode "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -405,11 +366,9 @@
* Test IRadioVoice.setPreferredVoicePrivacy() for the response returned.
*/
TEST_P(RadioVoiceTest, setPreferredVoicePrivacy) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping setPreferredVoicePrivacy "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping setPreferredVoicePrivacy "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -429,11 +388,9 @@
* Test IRadioVoice.getPreferredVoicePrivacy() for the response returned.
*/
TEST_P(RadioVoiceTest, getPreferredVoicePrivacy) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getPreferredVoicePrivacy "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getPreferredVoicePrivacy "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -453,11 +410,9 @@
* Test IRadioVoice.exitEmergencyCallbackMode() for the response returned.
*/
TEST_P(RadioVoiceTest, exitEmergencyCallbackMode) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping exitEmergencyCallbackMode "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping exitEmergencyCallbackMode "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -478,11 +433,9 @@
* Test IRadioVoice.handleStkCallSetupRequestFromSim() for the response returned.
*/
TEST_P(RadioVoiceTest, handleStkCallSetupRequestFromSim) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping handleStkCallSetupRequestFromSim "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping handleStkCallSetupRequestFromSim "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -506,11 +459,9 @@
* Test IRadioVoice.dial() for the response returned.
*/
TEST_P(RadioVoiceTest, dial) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping dial "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping dial "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -540,11 +491,9 @@
* Test IRadioVoice.hangup() for the response returned.
*/
TEST_P(RadioVoiceTest, hangup) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping hangup "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping hangup "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -566,11 +515,9 @@
* Test IRadioVoice.hangupWaitingOrBackground() for the response returned.
*/
TEST_P(RadioVoiceTest, hangupWaitingOrBackground) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping hangupWaitingOrBackground "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping hangupWaitingOrBackground "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -591,11 +538,9 @@
* Test IRadioVoice.hangupForegroundResumeBackground() for the response returned.
*/
TEST_P(RadioVoiceTest, hangupForegroundResumeBackground) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping hangupForegroundResumeBackground "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping hangupForegroundResumeBackground "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -616,11 +561,9 @@
* Test IRadioVoice.switchWaitingOrHoldingAndActive() for the response returned.
*/
TEST_P(RadioVoiceTest, switchWaitingOrHoldingAndActive) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping switchWaitingOrHoldingAndActive "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping switchWaitingOrHoldingAndActive "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -641,11 +584,9 @@
* Test IRadioVoice.conference() for the response returned.
*/
TEST_P(RadioVoiceTest, conference) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping conference "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping conference "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -666,11 +607,9 @@
* Test IRadioVoice.rejectCall() for the response returned.
*/
TEST_P(RadioVoiceTest, rejectCall) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping rejectCall "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping rejectCall "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -691,11 +630,9 @@
* Test IRadioVoice.getLastCallFailCause() for the response returned.
*/
TEST_P(RadioVoiceTest, getLastCallFailCause) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getLastCallFailCause "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getLastCallFailCause "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -715,11 +652,9 @@
* Test IRadioVoice.getCallForwardStatus() for the response returned.
*/
TEST_P(RadioVoiceTest, getCallForwardStatus) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getCallForwardStatus "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getCallForwardStatus "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -744,11 +679,9 @@
* Test IRadioVoice.setCallForward() for the response returned.
*/
TEST_P(RadioVoiceTest, setCallForward) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping setCallForward "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping setCallForward "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -773,11 +706,9 @@
* Test IRadioVoice.getCallWaiting() for the response returned.
*/
TEST_P(RadioVoiceTest, getCallWaiting) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getCallWaiting "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getCallWaiting "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -799,11 +730,9 @@
* Test IRadioVoice.setCallWaiting() for the response returned.
*/
TEST_P(RadioVoiceTest, setCallWaiting) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping setCallWaiting "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping setCallWaiting "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -825,11 +754,9 @@
* Test IRadioVoice.acceptCall() for the response returned.
*/
TEST_P(RadioVoiceTest, acceptCall) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping acceptCall "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping acceptCall "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -850,11 +777,9 @@
* Test IRadioVoice.separateConnection() for the response returned.
*/
TEST_P(RadioVoiceTest, separateConnection) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping separateConnection "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping separateConnection "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -876,11 +801,9 @@
* Test IRadioVoice.explicitCallTransfer() for the response returned.
*/
TEST_P(RadioVoiceTest, explicitCallTransfer) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping explicitCallTransfer "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping explicitCallTransfer "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -901,11 +824,9 @@
* Test IRadioVoice.sendCdmaFeatureCode() for the response returned.
*/
TEST_P(RadioVoiceTest, sendCdmaFeatureCode) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
- GTEST_SKIP() << "Skipping sendCdmaFeatureCode "
- "due to undefined FEATURE_TELEPHONY_CDMA";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CDMA)) {
+ GTEST_SKIP() << "Skipping sendCdmaFeatureCode "
+ "due to undefined FEATURE_TELEPHONY_CDMA";
}
serial = GetRandomSerialNumber();
@@ -928,11 +849,9 @@
* Test IRadioVoice.sendDtmf() for the response returned.
*/
TEST_P(RadioVoiceTest, sendDtmf) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping sendDtmf "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping sendDtmf "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -955,11 +874,9 @@
* Test IRadioVoice.startDtmf() for the response returned.
*/
TEST_P(RadioVoiceTest, startDtmf) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping startDtmf "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping startDtmf "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -982,11 +899,9 @@
* Test IRadioVoice.stopDtmf() for the response returned.
*/
TEST_P(RadioVoiceTest, stopDtmf) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping stopDtmf "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping stopDtmf "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -1008,11 +923,9 @@
* Test IRadioVoice.setMute() for the response returned.
*/
TEST_P(RadioVoiceTest, setMute) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping setMute "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping setMute "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -1033,11 +946,9 @@
* Test IRadioVoice.getMute() for the response returned.
*/
TEST_P(RadioVoiceTest, getMute) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping getMute "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping getMute "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -1056,11 +967,9 @@
* Test IRadioVoice.sendBurstDtmf() for the response returned.
*/
TEST_P(RadioVoiceTest, sendBurstDtmf) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping sendBurstDtmf "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping sendBurstDtmf "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -1082,11 +991,9 @@
* Test IRadioVoice.sendUssd() for the response returned.
*/
TEST_P(RadioVoiceTest, sendUssd) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping sendUssd "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping sendUssd "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -1107,11 +1014,9 @@
* Test IRadioVoice.cancelPendingUssd() for the response returned.
*/
TEST_P(RadioVoiceTest, cancelPendingUssd) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
- GTEST_SKIP() << "Skipping cancelPendingUssd "
- "due to undefined FEATURE_TELEPHONY_CALLING";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_CALLING)) {
+ GTEST_SKIP() << "Skipping cancelPendingUssd "
+ "due to undefined FEATURE_TELEPHONY_CALLING";
}
serial = GetRandomSerialNumber();
@@ -1133,11 +1038,9 @@
* Test IRadioVoice.isVoNrEnabled() for the response returned.
*/
TEST_P(RadioVoiceTest, isVoNrEnabled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
- GTEST_SKIP() << "Skipping isVoNrEnabled "
- "due to undefined FEATURE_TELEPHONY_IMS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
+ GTEST_SKIP() << "Skipping isVoNrEnabled "
+ "due to undefined FEATURE_TELEPHONY_IMS";
}
serial = GetRandomSerialNumber();
@@ -1155,11 +1058,9 @@
* Test IRadioVoice.setVoNrEnabled() for the response returned.
*/
TEST_P(RadioVoiceTest, setVoNrEnabled) {
- if (telephony_flags::enforce_telephony_feature_mapping()) {
- if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
- GTEST_SKIP() << "Skipping setVoNrEnabled "
- "due to undefined FEATURE_TELEPHONY_IMS";
- }
+ if (!deviceSupportsFeature(FEATURE_TELEPHONY_IMS)) {
+ GTEST_SKIP() << "Skipping setVoNrEnabled "
+ "due to undefined FEATURE_TELEPHONY_IMS";
}
serial = GetRandomSerialNumber();