Merge "Skip tests for single SIM devices" into android11-tests-dev (67103c08) · Commits · e / os / android_hardware_interfaces

radio/1.0/vts/functional/vts_test_util.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,13 @@ bool deviceSupportsFeature(const char* feature) {
		return hasFeature;
		}

		bool isSsSsEnabled() {
		// Do not use checkSubstringInCommandOutput("getprop persist.radio.multisim.config", "")
		// until b/148904287 is fixed. We need exact matching instead of partial matching. (i.e.
		// by definition the empty string "" is a substring of any string).
		return !isDsDsEnabled() && !isTsTsEnabled();
		}

		bool isDsDsEnabled() {
		return testing::checkSubstringInCommandOutput("getprop persist.radio.multisim.config", "dsds");
		}

+7 −2

Original line number	Diff line number	Diff line
		@@ -64,12 +64,17 @@ int GetRandomSerialNumber();
		bool deviceSupportsFeature(const char* feature);

		/*
		* Check if device is in DSDS.
		* Check if device is in SsSs (Single SIM Single Standby).
		*/
		bool isSsSsEnabled();

		/*
		* Check if device is in DSDS (Dual SIM Dual Standby).
		*/
		bool isDsDsEnabled();

		/*
		* Check if device is in TSTS.
		* Check if device is in TSTS (Triple SIM Triple Standby).
		*/
		bool isTsTsEnabled();