update vts to enforce telephony feature mapping (d519aead) · Commits · e / os / android_hardware_interfaces

radio/aidl/vts/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -66,9 +66,13 @@ cc_test {
		"radio_voice_test.cpp",
		"VtsHalRadioTargetTest.cpp",
		],
		header_libs: [
		"jni_headers",
		],
		shared_libs: [
		"libbinder_ndk",
		"libvintf",
		"server_configurable_flags",
		],
		static_libs: [
		"android.hardware.radio-V3-ndk",
		@@ -82,6 +86,7 @@ cc_test {
		"android.hardware.radio.sap-V1-ndk",
		"android.hardware.radio.sim-V3-ndk",
		"android.hardware.radio.voice-V3-ndk",
		"telephony_flags_c_lib",
		],
		test_suites: [
		"general-tests",

radio/aidl/vts/radio_aidl_hal_utils.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include <aidl/android/hardware/radio/network/RegState.h>
		#include <aidl/android/hardware/radio/sim/CardStatus.h>
		#include <aidl/android/hardware/radio/sim/IRadioSim.h>
		#include <com_android_internal_telephony_flags.h>
		#include <utils/Log.h>

		using namespace aidl::android::hardware::radio;
		@@ -31,6 +32,8 @@ using aidl::android::hardware::radio::config::SimSlotStatus;
		using aidl::android::hardware::radio::network::RegState;
		using aidl::android::hardware::radio::sim::CardStatus;

		namespace telephony_flags = com::android::internal::telephony::flags;

		extern CardStatus cardStatus;
		extern SimSlotStatus slotStatus;
		extern int serial;
		@@ -68,6 +71,18 @@ static constexpr const char* FEATURE_TELEPHONY_CDMA = "android.hardware.telephon

		static constexpr const char* FEATURE_TELEPHONY_IMS = "android.hardware.telephony.ims";

		static constexpr const char* FEATURE_TELEPHONY_CALLING = "android.hardware.telephony.calling";

		static constexpr const char* FEATURE_TELEPHONY_DATA = "android.hardware.telephony.data";

		static constexpr const char* FEATURE_TELEPHONY_MESSAGING = "android.hardware.telephony.messaging";

		static constexpr const char* FEATURE_TELEPHONY_SUBSCRIPTION =
		"android.hardware.telephony.subscription";

		static constexpr const char* FEATURE_TELEPHONY_RADIO_ACCESS =
		"android.hardware.telephony.radio.access";

		#define MODEM_EMERGENCY_CALL_ESTABLISH_TIME 3
		#define MODEM_EMERGENCY_CALL_DISCONNECT_TIME 3
		#define MODEM_SET_SIM_POWER_DELAY_IN_SECONDS 2

radio/aidl/vts/radio_config_test.cpp

+49 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,13 @@ 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);
		ASSERT_OK(res);
		@@ -66,6 +73,13 @@ 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);
		ASSERT_OK(res);
		@@ -78,6 +92,13 @@ 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);
		ASSERT_OK(res);
		@@ -104,6 +125,13 @@ TEST_P(RadioConfigTest, getPhoneCapability) {
		* 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);
		ASSERT_OK(res);
		@@ -146,6 +174,13 @@ 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;
		ndk::ScopedAStatus res = radio_config->setPreferredDataModem(serial, modemId);
		@@ -166,6 +201,13 @@ 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();
		if (radioRsp_config->rspInfo.error == RadioError::NONE) {
		@@ -227,6 +269,13 @@ 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);
		ASSERT_OK(res);

radio/aidl/vts/radio_data_test.cpp

+76 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,12 @@ 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();

		AccessNetwork accessNetwork = AccessNetwork::EUTRAN;
		@@ -135,6 +141,13 @@ 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();

		AccessNetwork accessNetwork = AccessNetwork::EUTRAN;
		@@ -227,6 +240,13 @@ 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);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		@@ -242,6 +262,13 @@ 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();

		ndk::ScopedAStatus res = radio_data->setDataThrottling(
		@@ -320,6 +347,13 @@ 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();

		// Create a dataProfileInfo
		@@ -363,6 +397,13 @@ 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();

		// Create a dataProfileInfo
		@@ -409,6 +450,13 @@ 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;
		DataRequestReason reason = DataRequestReason::NORMAL;
		@@ -440,6 +488,13 @@ 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 = {
		{
		// Invalid IPv4 source address
		@@ -538,6 +593,13 @@ 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();

		radio_data->stopKeepalive(serial, 0xBAD);
		@@ -554,6 +616,13 @@ 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();

		radio_data->getDataCallList(serial);
		@@ -573,6 +642,13 @@ 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

+147 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,13 @@ 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;
		msg.smscPdu = "";
		@@ -83,6 +90,13 @@ 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;
		msg.smscPdu = "";
		@@ -106,6 +120,13 @@ 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();

		// Create a CdmaSmsAddress
		@@ -150,6 +171,13 @@ 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();

		// Create a CdmaSmsAddress
		@@ -194,6 +222,13 @@ 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();

		// Create GsmBroadcastSmsConfigInfo #1
		@@ -257,6 +292,13 @@ 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();

		radio_messaging->getGsmBroadcastConfig(serial);
		@@ -277,6 +319,13 @@ 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();

		CdmaBroadcastSmsConfigInfo cbSmsConfig;
		@@ -303,6 +352,13 @@ 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();

		radio_messaging->getCdmaBroadcastConfig(serial);
		@@ -321,6 +377,13 @@ 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;

		@@ -341,6 +404,13 @@ 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;

		@@ -363,6 +433,13 @@ 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;

		@@ -384,6 +461,13 @@ 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;
		std::string ackPdu = "";
		@@ -405,6 +489,13 @@ 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();

		// Create a CdmaSmsAck
		@@ -429,6 +520,13 @@ 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();

		// Create a CdmaSmsAddress
		@@ -479,6 +577,13 @@ 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();

		radio_messaging->getSmscAddress(serial);
		@@ -499,6 +604,13 @@ 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");

		@@ -520,6 +632,13 @@ 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;
		smsWriteArgs.status = SmsWriteArgs::STATUS_REC_UNREAD;
		@@ -546,6 +665,13 @@ 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;

		@@ -569,6 +695,13 @@ 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();

		// Create a CdmaSmsAddress
		@@ -620,6 +753,13 @@ 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;

		@@ -671,6 +811,13 @@ 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;