Snap for 5702333 from a8baf71318f045b4157f1ef0cf16c4c6e66ebe7b to qt-c2f2-release (9fb80101) · Commits · e / os / android_hardware_interfaces

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -607,7 +607,9 @@ public:

		struct DeviceCb : public V3_5::ICameraDeviceCallback {
		DeviceCb(CameraHidlTest parent, int deviceVersion, const camera_metadata_t staticMeta) :
		mParent(parent), mDeviceVersion(deviceVersion), mStaticMetadata(staticMeta) {}
		mParent(parent), mDeviceVersion(deviceVersion) {
		mStaticMetadata = staticMeta;
		}

		Return<void> processCaptureResult_3_4(
		const hidl_vec<V3_4::CaptureResult>& results) override;
		@@ -631,7 +633,7 @@ public:

		CameraHidlTest *mParent; // Parent object
		int mDeviceVersion;
		const camera_metadata_t *mStaticMetadata;
		android::hardware::camera::common::V1_0::helper::CameraMetadata mStaticMetadata;
		bool hasOutstandingBuffersLocked();

		/* members for requestStreamBuffers() and returnStreamBuffers()*/
		@@ -1194,18 +1196,20 @@ bool CameraHidlTest::DeviceCb::processCaptureResultLocked(const CaptureResult& r
		// Verify final result metadata
		bool isAtLeast_3_5 = mDeviceVersion >= CAMERA_DEVICE_API_VERSION_3_5;
		if (isAtLeast_3_5) {
		auto staticMetadataBuffer = mStaticMetadata.getAndLock();
		bool isMonochrome = Status::OK ==
		CameraHidlTest::isMonochromeCamera(mStaticMetadata);
		CameraHidlTest::isMonochromeCamera(staticMetadataBuffer);
		if (isMonochrome) {
		mParent->verifyMonochromeCameraResult(request->collectedResult);
		}

		// Verify logical camera result metadata
		bool isLogicalCamera =
		Status::OK == CameraHidlTest::isLogicalMultiCamera(mStaticMetadata);
		Status::OK == CameraHidlTest::isLogicalMultiCamera(staticMetadataBuffer);
		if (isLogicalCamera) {
		mParent->verifyLogicalCameraResult(mStaticMetadata, request->collectedResult);
		mParent->verifyLogicalCameraResult(staticMetadataBuffer, request->collectedResult);
		}
		mStaticMetadata.unlock(staticMetadataBuffer);
		}
		}

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

+18 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,12 @@ TEST_F(RadioHidlTest_v1_4, emergencyDial) {

		ALOGI("emergencyDial, rspInfo.error = %s\n", toString(radioRsp_v1_4->rspInfo.error).c_str());
		EXPECT_EQ(RadioError::NONE, radioRsp_v1_4->rspInfo.error);

		// Give some time for modem to establish the emergency call channel.
		sleep(MODEM_EMERGENCY_CALL_ESTABLISH_TIME);

		// Disconnect all the potential established calls to prevent them affecting other tests.
		clearPotentialEstablishedCalls();
		}

		/*
		@@ -67,6 +73,12 @@ TEST_F(RadioHidlTest_v1_4, emergencyDial_withServices) {
		ALOGI("emergencyDial_withServices, rspInfo.error = %s\n",
		toString(radioRsp_v1_4->rspInfo.error).c_str());
		EXPECT_EQ(RadioError::NONE, radioRsp_v1_4->rspInfo.error);

		// Give some time for modem to establish the emergency call channel.
		sleep(MODEM_EMERGENCY_CALL_ESTABLISH_TIME);

		// Disconnect all the potential established calls to prevent them affecting other tests.
		clearPotentialEstablishedCalls();
		}

		/*
		@@ -93,6 +105,12 @@ TEST_F(RadioHidlTest_v1_4, emergencyDial_withEmergencyRouting) {
		ALOGI("emergencyDial_withEmergencyRouting, rspInfo.error = %s\n",
		toString(radioRsp_v1_4->rspInfo.error).c_str());
		EXPECT_EQ(RadioError::NONE, radioRsp_v1_4->rspInfo.error);

		// Give some time for modem to establish the emergency call channel.
		sleep(MODEM_EMERGENCY_CALL_ESTABLISH_TIME);

		// Disconnect all the potential established calls to prevent them affecting other tests.
		clearPotentialEstablishedCalls();
		}

		/*

radio/1.4/vts/functional/radio_hidl_hal_test.cpp

+17 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,23 @@ std::cv_status RadioHidlTest_v1_4::wait() {
		return status;
		}

		void RadioHidlTest_v1_4::clearPotentialEstablishedCalls() {
		// Get the current call Id to hangup the established emergency call.
		serial = GetRandomSerialNumber();
		radio_v1_4->getCurrentCalls(serial);
		EXPECT_EQ(std::cv_status::no_timeout, wait());

		// Hang up to disconnect the established call channels.
		for (const ::android::hardware::radio::V1_2::Call& call : radioRsp_v1_4->currentCalls) {
		serial = GetRandomSerialNumber();
		radio_v1_4->hangup(serial, call.base.index);
		ALOGI("Hang up to disconnect the established call channel: %d", call.base.index);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		// Give some time for modem to disconnect the established call channel.
		sleep(MODEM_EMERGENCY_CALL_DISCONNECT_TIME);
		}
		}

		void RadioHidlTest_v1_4::updateSimCardStatus() {
		serial = GetRandomSerialNumber();
		radio_v1_4->getIccCardStatus(serial);

radio/1.4/vts/functional/radio_hidl_hal_utils_v1_4.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,9 @@ using ::android::hardware::Return;
		using ::android::hardware::Void;

		#define TIMEOUT_PERIOD 75
		#define MODEM_EMERGENCY_CALL_ESTABLISH_TIME 3
		#define MODEM_EMERGENCY_CALL_DISCONNECT_TIME 3

		#define RADIO_SERVICE_NAME "slot1"

		class RadioHidlTest_v1_4;
		@@ -59,6 +62,9 @@ class RadioResponse_v1_4 : public ::android::hardware::radio::V1_4::IRadioRespon

		RadioResponseInfo rspInfo;

		// Call
		hidl_vec<::android::hardware::radio::V1_2::Call> currentCalls;

		// Modem
		bool isModemEnabled;
		bool enableModemResponseToggle;
		@@ -725,6 +731,9 @@ class RadioHidlTest_v1_4 : public ::testing::VtsHalHidlTargetTestBase {
		/* Serial number for radio request */
		int serial;

		/* Clear Potential Established Calls */
		void clearPotentialEstablishedCalls();

		/* Update Sim Card Status */
		void updateSimCardStatus();

radio/1.4/vts/functional/radio_response.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -77,7 +77,9 @@ Return<void> RadioResponse_v1_4::getIMSIForAppResponse(
		return Void();
		}

		Return<void> RadioResponse_v1_4::hangupConnectionResponse(const RadioResponseInfo& /info/) {
		Return<void> RadioResponse_v1_4::hangupConnectionResponse(const RadioResponseInfo& info) {
		rspInfo = info;
		parent_v1_4.notify(info.serial);
		return Void();
		}

		@@ -729,9 +731,10 @@ Return<void> RadioResponse_v1_4::getIccCardStatusResponse_1_2(

		Return<void> RadioResponse_v1_4::getCurrentCallsResponse_1_2(
		const RadioResponseInfo& info,
		const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& /calls/) {
		const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& calls) {
		rspInfo = info;
		parent_v1_4.notify(info.serial);
		currentCalls = calls;
		return Void();
		}