Merge "Cleaned up the flag enforce_telephony_feature_mapping" into main (b152388c) · Commits · e / os / android_hardware_interfaces

radio/aidl/vts/radio_config_test.cpp

+24 −40

Original line number	Diff line number	Diff line
		@@ -54,12 +54,10 @@ void RadioConfigTest::updateSimSlotStatus() {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		ndk::ScopedAStatus res = radio_config->getHalDeviceCapabilities(serial);
		@@ -73,12 +71,10 @@ TEST_P(RadioConfigTest, getHalDeviceCapabilities) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		ndk::ScopedAStatus res = radio_config->getSimSlotsStatus(serial);
		@@ -92,12 +88,10 @@ TEST_P(RadioConfigTest, getSimSlotsStatus) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		ndk::ScopedAStatus res = radio_config->getPhoneCapability(serial);
		@@ -125,12 +119,10 @@ TEST_P(RadioConfigTest, getPhoneCapability) {
		* 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";
		}
		}

		int32_t aidl_version;
		ndk::ScopedAStatus aidl_status = radio_config->getInterfaceVersion(&aidl_version);
		@@ -167,12 +159,10 @@ TEST_P(RadioConfigTest, getSimultaneousCallingSupport) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		ndk::ScopedAStatus res = radio_config->getPhoneCapability(serial);
		@@ -216,12 +206,10 @@ TEST_P(RadioConfigTest, setPreferredDataModem) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		uint8_t modemId = -1;
		@@ -243,12 +231,10 @@ TEST_P(RadioConfigTest, setPreferredDataModem_invalidArgument) {
		* 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";
		}
		}

		// get slot status and set SIM slots mapping based on the result.
		updateSimSlotStatus();
		@@ -318,12 +304,10 @@ TEST_P(RadioConfigTest, setSimSlotsMapping) {
		*/

		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";
		}
		}

		serial = GetRandomSerialNumber();
		ndk::ScopedAStatus res = radio_config->getSimSlotsStatus(serial);

radio/aidl/vts/radio_data_test.cpp

+32 −54

Original line number	Diff line number	Diff line
		@@ -68,11 +68,9 @@ ndk::ScopedAStatus RadioDataTest::getDataCallList() {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -141,12 +139,10 @@ TEST_P(RadioDataTest, setupDataCall) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -240,12 +236,10 @@ TEST_P(RadioDataTest, setupDataCall_osAppId) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		radio_data->getSlicingConfig(serial);
		@@ -262,12 +256,10 @@ TEST_P(RadioDataTest, getSlicingConfig) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -347,12 +339,10 @@ TEST_P(RadioDataTest, setDataThrottling) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -397,12 +387,10 @@ TEST_P(RadioDataTest, setInitialAttachApn) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -450,12 +438,10 @@ TEST_P(RadioDataTest, setDataProfile) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		int cid = 1;
		@@ -488,12 +474,10 @@ TEST_P(RadioDataTest, deactivateDataCall) {
		* 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";
		}
		}

		std::vector<KeepaliveRequest> requests = {
		{
		@@ -593,12 +577,10 @@ TEST_P(RadioDataTest, startKeepalive) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -616,12 +598,10 @@ TEST_P(RadioDataTest, stopKeepalive) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -642,12 +622,10 @@ TEST_P(RadioDataTest, getDataCallList) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		bool allow = true;

radio/aidl/vts/radio_messaging_test.cpp

+63 −105

Original line number	Diff line number	Diff line
		@@ -59,12 +59,10 @@ void RadioMessagingTest::SetUp() {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		GsmSmsMessage msg;
		@@ -90,12 +88,10 @@ TEST_P(RadioMessagingTest, sendSms) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		GsmSmsMessage msg;
		@@ -120,12 +116,10 @@ TEST_P(RadioMessagingTest, sendSmsExpectMore) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -171,12 +165,10 @@ TEST_P(RadioMessagingTest, sendCdmaSms) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -222,12 +214,10 @@ TEST_P(RadioMessagingTest, sendCdmaSmsExpectMore) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -292,12 +282,10 @@ TEST_P(RadioMessagingTest, setGsmBroadcastConfig) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -319,12 +307,10 @@ TEST_P(RadioMessagingTest, getGsmBroadcastConfig) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -352,12 +338,10 @@ TEST_P(RadioMessagingTest, setCdmaBroadcastConfig) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -377,12 +361,10 @@ TEST_P(RadioMessagingTest, getCdmaBroadcastConfig) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		bool activate = false;
		@@ -404,12 +386,10 @@ TEST_P(RadioMessagingTest, setCdmaBroadcastActivation) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		bool activate = false;
		@@ -433,12 +413,10 @@ TEST_P(RadioMessagingTest, setGsmBroadcastActivation) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		bool success = true;
		@@ -461,12 +439,10 @@ TEST_P(RadioMessagingTest, acknowledgeLastIncomingGsmSms) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		bool success = true;
		@@ -489,12 +465,10 @@ TEST_P(RadioMessagingTest, acknowledgeIncomingGsmSmsWithPdu) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -520,12 +494,10 @@ TEST_P(RadioMessagingTest, acknowledgeLastIncomingCdmaSms) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -577,12 +549,10 @@ TEST_P(RadioMessagingTest, sendImsSms) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -604,12 +574,10 @@ TEST_P(RadioMessagingTest, getSmscAddress) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		std::string address = std::string("smscAddress");
		@@ -632,12 +600,10 @@ TEST_P(RadioMessagingTest, setSmscAddress) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		SmsWriteArgs smsWriteArgs;
		@@ -665,12 +631,10 @@ TEST_P(RadioMessagingTest, writeSmsToSim) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		int index = 1;
		@@ -695,12 +659,10 @@ TEST_P(RadioMessagingTest, deleteSmsOnSim) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -753,12 +715,10 @@ TEST_P(RadioMessagingTest, writeSmsToRuim) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		int index = 1;
		@@ -811,12 +771,10 @@ TEST_P(RadioMessagingTest, deleteSmsOnRuim) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		bool available = true;

radio/aidl/vts/radio_modem_test.cpp

+36 −60

Original line number	Diff line number	Diff line
		@@ -68,12 +68,10 @@ bool RadioModemTest::shouldTestCdma() {
		* 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";
		}
		}

		// Set radio power to off.
		serial = GetRandomSerialNumber();
		@@ -106,12 +104,10 @@ TEST_P(RadioModemTest, setRadioPower_emergencyCall_cancelled) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -157,12 +153,10 @@ TEST_P(RadioModemTest, enableModem) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -182,12 +176,10 @@ TEST_P(RadioModemTest, getModemStackStatus) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -205,12 +197,10 @@ TEST_P(RadioModemTest, getBasebandVersion) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -298,12 +288,10 @@ TEST_P(RadioModemTest, nvWriteItem) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		std::vector<uint8_t> prl = {1, 2, 3, 4, 5};
		@@ -342,12 +330,10 @@ TEST_P(RadioModemTest, nvResetConfig) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -368,12 +354,10 @@ TEST_P(RadioModemTest, getHardwareConfig) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -392,12 +376,10 @@ TEST_P(RadioModemTest, DISABLED_requestShutdown) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -415,12 +397,10 @@ TEST_P(RadioModemTest, getRadioCapability) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();
		RadioCapability rc;
		@@ -443,12 +423,10 @@ TEST_P(RadioModemTest, setRadioCapability) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

		@@ -467,12 +445,10 @@ TEST_P(RadioModemTest, getModemActivityInfo) {
		* 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";
		}
		}

		serial = GetRandomSerialNumber();

radio/aidl/vts/radio_network_test.cpp

+192 −320

File changed.

Preview size limit exceeded, changes collapsed.