Snap for 7767938 from 0bb25440965402715fbe6e2b59f5240d63e566e2 to sc-v2-release (93cf4608) · Commits · e / os / android_hardware_interfaces

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -3837,6 +3837,8 @@ TEST_P(CameraHidlTest, configureStreamsZSLInputOutputs) {
		getAvailableOutputStreams(staticMeta, outputStreams,
		&outputThreshold));
		for (auto& outputIter : outputStreams) {
		V3_2::DataspaceFlags outputDataSpace =
		getDataspace(static_cast<PixelFormat>(outputIter.format));
		V3_2::Stream zslStream = {streamId++,
		StreamType::OUTPUT,
		static_cast<uint32_t>(input.width),
		@@ -3859,7 +3861,7 @@ TEST_P(CameraHidlTest, configureStreamsZSLInputOutputs) {
		static_cast<uint32_t>(outputIter.height),
		static_cast<PixelFormat>(outputIter.format),
		GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
		0,
		outputDataSpace,
		StreamRotation::ROTATION_0};

		::android::hardware::hidl_vec<V3_2::Stream> streams = {inputStream, zslStream,

radio/1.0/vts/functional/radio_hidl_hal_test.cpp

+32 −2

Original line number	Diff line number	Diff line
		@@ -17,12 +17,42 @@
		#include <android-base/logging.h>
		#include <radio_hidl_hal_utils_v1_0.h>

		bool isServiceValidForDeviceConfiguration(hidl_string& serviceName) {
		if (isSsSsEnabled()) {
		// Device is configured as SSSS.
		if (serviceName != RADIO_SERVICE_SLOT1_NAME) {
		ALOGI("%s instance is not valid for SSSS device.", serviceName.c_str());
		return false;
		}
		} else if (isDsDsEnabled()) {
		// Device is configured as DSDS.
		if (serviceName != RADIO_SERVICE_SLOT1_NAME && serviceName != RADIO_SERVICE_SLOT2_NAME) {
		ALOGI("%s instance is not valid for DSDS device.", serviceName.c_str());
		return false;
		}
		} else if (isTsTsEnabled()) {
		// Device is configured as TSTS.
		if (serviceName != RADIO_SERVICE_SLOT1_NAME && serviceName != RADIO_SERVICE_SLOT2_NAME &&
		serviceName != RADIO_SERVICE_SLOT3_NAME) {
		ALOGI("%s instance is not valid for TSTS device.", serviceName.c_str());
		return false;
		}
		}
		return true;
		}

		void RadioHidlTest::SetUp() {
		radio = IRadio::getService(GetParam());
		hidl_string serviceName = GetParam();
		if (!isServiceValidForDeviceConfiguration(serviceName)) {
		ALOGI("Skipped the test due to device configuration.");
		GTEST_SKIP();
		}

		radio = IRadio::getService(serviceName);
		if (radio == NULL) {
		LOG(DEBUG) << "Radio is NULL, waiting 1 minute to retry";
		sleep(60);
		radio = IRadio::getService(GetParam());
		radio = IRadio::getService(serviceName);
		}
		ASSERT_NE(nullptr, radio.get());

radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		#include <android-base/logging.h>

		#include <log/log.h>
		#include <chrono>
		#include <condition_variable>
		#include <mutex>
		@@ -41,6 +42,15 @@ using ::android::sp;
		#define SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(__ver__) \
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL(__ver__, radio, radioRsp)

		// HAL instance name for SIM slot 1 or single SIM device
		#define RADIO_SERVICE_SLOT1_NAME "slot1"

		// HAL instance name for SIM slot 2 on dual SIM device
		#define RADIO_SERVICE_SLOT2_NAME "slot2"

		// HAL instance name for SIM slot 3 on triple SIM device
		#define RADIO_SERVICE_SLOT3_NAME "slot3"

		class RadioHidlTest;
		extern CardStatus cardStatus;

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+11 −10

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ TEST_P(RadioHidlTest_v1_6, sendSms_1_6) {
		msg.smscPdu = "";
		msg.pdu = "01000b916105770203f3000006d4f29c3e9b01";

		radio_v1_6->sendSms(serial, msg);
		radio_v1_6->sendSms_1_6(serial, msg);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		@@ -303,7 +303,7 @@ TEST_P(RadioHidlTest_v1_6, sendSmsExpectMore_1_6) {
		msg.smscPdu = "";
		msg.pdu = "01000b916105770203f3000006d4f29c3e9b01";

		radio_v1_6->sendSMSExpectMore(serial, msg);
		radio_v1_6->sendSmsExpectMore_1_6(serial, msg);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		@@ -351,7 +351,7 @@ TEST_P(RadioHidlTest_v1_6, sendCdmaSms_1_6) {
		cdmaSmsMessage.bearerData =
		(std::vector<uint8_t>){15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0};

		radio_v1_6->sendCdmaSms(serial, cdmaSmsMessage);
		radio_v1_6->sendCdmaSms_1_6(serial, cdmaSmsMessage);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		@@ -398,7 +398,7 @@ TEST_P(RadioHidlTest_v1_6, sendCdmaSmsExpectMore_1_6) {
		cdmaSmsMessage.bearerData =
		(std::vector<uint8_t>){15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0};

		radio_v1_6->sendCdmaSmsExpectMore(serial, cdmaSmsMessage);
		radio_v1_6->sendCdmaSmsExpectMore_1_6(serial, cdmaSmsMessage);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		@@ -464,11 +464,12 @@ TEST_P(RadioHidlTest_v1_6, setNrDualConnectivityState) {
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
		} else {
		ASSERT_TRUE(
		CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
		::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,
		::android::hardware::radio::V1_6::RadioError::INVALID_STATE,
		::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,
		::android::hardware::radio::V1_6::RadioError::NONE}));
		}
		}