Snap for 5582428 from e4be4c97653bc3a255e1fcc27913545edd76e71b to qt-release (c9ad0a5e) · Commits · e / os / android_hardware_interfaces

camera/device/3.2/ICameraDeviceCallback.hal

+15 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,21 @@ interface ICameraDeviceCallback {
		* via a SHUTTER notify() call. It is highly recommended to dispatch this
		* call as early as possible.
		*
		* The SHUTTER notify calls for requests with android.control.enableZsl
		* set to TRUE and ANDROID_CONTROL_CAPTURE_INTENT == STILL_CAPTURE may be
		* out-of-order compared to SHUTTER notify for other kinds of requests
		* (including regular, reprocess, or zero-shutter-lag requests with
		* different capture intents).
		*
		* As a result, the capture results of zero-shutter-lag requests with
		* ANDROID_CONTROL_CAPTURE_INTENT == STILL_CAPTURE may be out-of-order
		* compared to capture results for other kinds of requests.
		*
		* Different SHUTTER notify calls for zero-shutter-lag requests with
		* ANDROID_CONTROL_CAPTURE_INTENT == STILL_CAPTURE must be in order between
		* them, as is for other kinds of requests. SHUTTER notify calls for
		* zero-shutter-lag requests with non STILL_CAPTURE intent must be in order
		* with SHUTTER notify calls for regular requests.
		* ------------------------------------------------------------------------
		* Performance requirements:
		*

camera/device/3.2/default/CameraDeviceSession.cpp

+25 −6

Original line number	Diff line number	Diff line
		@@ -99,12 +99,21 @@ bool CameraDeviceSession::initialize() {
		return true;
		}

		int32_t reqFMQSize = property_get_int32("ro.camera.req.fmq.size", /default/-1);
		// "ro.camera" properties are no longer supported on vendor side.
		// Support a fall back for the fmq size override that uses "ro.vendor.camera"
		// properties.
		int32_t reqFMQSize = property_get_int32("ro.vendor.camera.req.fmq.size", /default/-1);
		if (reqFMQSize < 0) {
		reqFMQSize = property_get_int32("ro.camera.req.fmq.size", /default/-1);
		if (reqFMQSize < 0) {
		reqFMQSize = CAMERA_REQUEST_METADATA_QUEUE_SIZE;
		} else {
		ALOGV("%s: request FMQ size overridden to %d", __FUNCTION__, reqFMQSize);
		}
		} else {
		ALOGV("%s: request FMQ size overridden to %d via fallback property", __FUNCTION__,
		reqFMQSize);
		}

		mRequestMetadataQueue = std::make_unique<RequestMetadataQueue>(
		static_cast<size_t>(reqFMQSize),
		@@ -114,12 +123,22 @@ bool CameraDeviceSession::initialize() {
		return true;
		}

		int32_t resFMQSize = property_get_int32("ro.camera.res.fmq.size", /default/-1);
		// "ro.camera" properties are no longer supported on vendor side.
		// Support a fall back for the fmq size override that uses "ro.vendor.camera"
		// properties.
		int32_t resFMQSize = property_get_int32("ro.vendor.camera.res.fmq.size", /default/-1);
		if (resFMQSize < 0) {
		resFMQSize = property_get_int32("ro.camera.res.fmq.size", /default/-1);
		if (resFMQSize < 0) {
		resFMQSize = CAMERA_RESULT_METADATA_QUEUE_SIZE;
		} else {
		ALOGV("%s: result FMQ size overridden to %d", __FUNCTION__, resFMQSize);
		}
		} else {
		ALOGV("%s: result FMQ size overridden to %d via fallback property", __FUNCTION__,
		resFMQSize);
		}

		mResultMetadataQueue = std::make_shared<RequestMetadataQueue>(
		static_cast<size_t>(resFMQSize),
		false /* non blocking */);

current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -386,6 +386,7 @@ cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardwar

		# ABI preserving changes to HALs during Android Q
		2a55e224aa9bc62c0387cd85ad3c97e33f0c33a4e1489cbae86b2523e6f9df35 android.hardware.camera.device@3.2::ICameraDevice
		17e878cb11ea602c08af04a09182e6265498be16edf26605058383b9a7628261 android.hardware.camera.device@3.2::ICameraDeviceCallback
		8caf9104dc6885852c0b117d853dd93f6d4b61a0a365138295eb8bcd41b36423 android.hardware.camera.device@3.2::ICameraDeviceSession
		684702a60deef03a1e8093961dc0a18c555c857ad5a77ba7340b0635ae01eb70 android.hardware.camera.device@3.4::ICameraDeviceSession
		f8a19622cb0cc890913b1ef3e32b675ffb26089a09e02fef4056ebad324d2b5d android.hardware.camera.device@3.4::types

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+10 −4

Original line number	Diff line number	Diff line
		@@ -723,6 +723,7 @@ TEST_F(RadioHidlTest_v1_2, getDataRegistrationState) {
		// Check the mcc [0, 999] and mnc [0, 999].
		string hidl_mcc;
		string hidl_mnc;
		bool checkMccMnc = true;
		int totalIdentitySizeExpected = 1;
		::android::hardware::radio::V1_2::CellIdentity cellIdentities =
		radioRsp_v1_2->dataRegResp.cellIdentity;
		@@ -731,6 +732,7 @@ TEST_F(RadioHidlTest_v1_2, getDataRegistrationState) {
		if (cellInfoType == CellInfoType::NONE) {
		// All the fields are 0
		totalIdentitySizeExpected = 0;
		checkMccMnc = false;
		} else if (cellInfoType == CellInfoType::GSM) {
		EXPECT_EQ(1, cellIdentities.cellIdentityGsm.size());
		::android::hardware::radio::V1_2::CellIdentityGsm cig = cellIdentities.cellIdentityGsm[0];
		@@ -757,6 +759,7 @@ TEST_F(RadioHidlTest_v1_2, getDataRegistrationState) {
		// CellIndentityCdma has no mcc and mnc.
		EXPECT_EQ(CellInfoType::CDMA, cellInfoType);
		EXPECT_EQ(1, cellIdentities.cellIdentityCdma.size());
		checkMccMnc = false;
		}

		// Check only one CellIdentity is size 1, and others must be 0.
		@@ -765,11 +768,14 @@ TEST_F(RadioHidlTest_v1_2, getDataRegistrationState) {
		cellIdentities.cellIdentityLte.size() + cellIdentities.cellIdentityWcdma.size() +
		cellIdentities.cellIdentityTdscdma.size());

		// 32 bit system might return invalid mcc and mnc hidl string "\xff\xff..."
		if (checkMccMnc && hidl_mcc.size() < 4 && hidl_mnc.size() < 4) {
		int mcc = stoi(hidl_mcc);
		int mnc = stoi(hidl_mnc);
		EXPECT_TRUE(mcc >= 0 && mcc <= 999);
		EXPECT_TRUE(mnc >= 0 && mnc <= 999);
		}
		}

		/*
		* Test IRadio.getAvailableBandModes() for the response returned.