Merge "Camera: Fix possible invalid metadata access" into rvc-dev am: 967bfe95b6 (7f253664) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/common/CameraProviderManager.cpp

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -841,13 +841,6 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::addDynamicDepthTags()
	itDuration++; itSize++;		itDuration++; itSize++;
	}		}

	c.update(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS,
	dynamicDepthEntries.data(), dynamicDepthEntries.size());
	c.update(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS,
	dynamicDepthMinDurationEntries.data(), dynamicDepthMinDurationEntries.size());
	c.update(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS,
	dynamicDepthStallDurationEntries.data(), dynamicDepthStallDurationEntries.size());

	std::vector<int32_t> supportedChTags;		std::vector<int32_t> supportedChTags;
	supportedChTags.reserve(chTags.count + 3);		supportedChTags.reserve(chTags.count + 3);
	supportedChTags.insert(supportedChTags.end(), chTags.data.i32,		supportedChTags.insert(supportedChTags.end(), chTags.data.i32,
	@@ -855,6 +848,12 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::addDynamicDepthTags()
	supportedChTags.push_back(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS);		supportedChTags.push_back(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS);
	supportedChTags.push_back(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS);		supportedChTags.push_back(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS);
	supportedChTags.push_back(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS);		supportedChTags.push_back(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS);
			c.update(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS,
			dynamicDepthEntries.data(), dynamicDepthEntries.size());
			c.update(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS,
			dynamicDepthMinDurationEntries.data(), dynamicDepthMinDurationEntries.size());
			c.update(ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS,
			dynamicDepthStallDurationEntries.data(), dynamicDepthStallDurationEntries.size());
	c.update(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS, supportedChTags.data(),		c.update(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS, supportedChTags.data(),
	supportedChTags.size());		supportedChTags.size());

services/camera/libcameraservice/tests/Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,8 @@ LOCAL_C_INCLUDES += \

	LOCAL_CFLAGS += -Wall -Wextra -Werror		LOCAL_CFLAGS += -Wall -Wextra -Werror

			LOCAL_SANITIZE := address

	LOCAL_MODULE:= cameraservice_test		LOCAL_MODULE:= cameraservice_test
	LOCAL_COMPATIBILITY_SUITE := device-tests		LOCAL_COMPATIBILITY_SUITE := device-tests
	LOCAL_MODULE_TAGS := tests		LOCAL_MODULE_TAGS := tests

services/camera/libcameraservice/tests/CameraProviderManagerTest.cpp

+61 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,8 +40,15 @@ using android::hardware::camera::provider::V2_5::DeviceState;
	*/		*/
	struct TestDeviceInterface : public device::V3_2::ICameraDevice {		struct TestDeviceInterface : public device::V3_2::ICameraDevice {
	std::vector<hardware::hidl_string> mDeviceNames;		std::vector<hardware::hidl_string> mDeviceNames;
			android::hardware::hidl_vec<uint8_t> mCharacteristics;

			TestDeviceInterface(std::vector<hardware::hidl_string> deviceNames,
			android::hardware::hidl_vec<uint8_t> chars) :
			mDeviceNames(deviceNames), mCharacteristics(chars) {}

	TestDeviceInterface(std::vector<hardware::hidl_string> deviceNames) :		TestDeviceInterface(std::vector<hardware::hidl_string> deviceNames) :
	mDeviceNames(deviceNames) {}		mDeviceNames(deviceNames) {}

	using getResourceCost_cb = std::function<void(		using getResourceCost_cb = std::function<void(
	hardware::camera::common::V1_0::Status status,		hardware::camera::common::V1_0::Status status,
	const hardware::camera::common::V1_0::CameraResourceCost& resourceCost)>;		const hardware::camera::common::V1_0::CameraResourceCost& resourceCost)>;
	@@ -58,8 +65,7 @@ struct TestDeviceInterface : public device::V3_2::ICameraDevice {
	const hardware::hidl_vec<uint8_t>& cameraCharacteristics)>;		const hardware::hidl_vec<uint8_t>& cameraCharacteristics)>;
	hardware::Return<void> getCameraCharacteristics(		hardware::Return<void> getCameraCharacteristics(
	getCameraCharacteristics_cb _hidl_cb) override {		getCameraCharacteristics_cb _hidl_cb) override {
	hardware::hidl_vec<uint8_t> cameraCharacteristics;		_hidl_cb(Status::OK, mCharacteristics);
	_hidl_cb(Status::OK, cameraCharacteristics);
	return hardware::Void();		return hardware::Void();
	}		}

	@@ -100,6 +106,13 @@ struct TestICameraProvider : virtual public provider::V2_5::ICameraProvider {
	mDeviceInterface(new TestDeviceInterface(devices)),		mDeviceInterface(new TestDeviceInterface(devices)),
	mVendorTagSections (vendorSection) {}		mVendorTagSections (vendorSection) {}

			TestICameraProvider(const std::vector<hardware::hidl_string> &devices,
			const hardware::hidl_vec<common::V1_0::VendorTagSection> &vendorSection,
			android::hardware::hidl_vec<uint8_t> chars) :
			mDeviceNames(devices),
			mDeviceInterface(new TestDeviceInterface(devices, chars)),
			mVendorTagSections (vendorSection) {}

	virtual hardware::Return<Status> setCallback(		virtual hardware::Return<Status> setCallback(
	const sp<provider::V2_4::ICameraProviderCallback>& callbacks) override {		const sp<provider::V2_4::ICameraProviderCallback>& callbacks) override {
	mCalledCounter[SET_CALLBACK]++;		mCalledCounter[SET_CALLBACK]++;
	@@ -243,6 +256,52 @@ struct TestStatusListener : public CameraProviderManager::StatusListener {
	void onNewProviderRegistered() override {}		void onNewProviderRegistered() override {}
	};		};

			TEST(CameraProviderManagerTest, InitializeDynamicDepthTest) {
			std::vector<hardware::hidl_string> deviceNames;
			deviceNames.push_back("device@3.2/test/0");
			hardware::hidl_vec<common::V1_0::VendorTagSection> vendorSection;
			status_t res;
			sp<CameraProviderManager> providerManager = new CameraProviderManager();
			sp<TestStatusListener> statusListener = new TestStatusListener();
			TestInteractionProxy serviceProxy;

			android::hardware::hidl_vec<uint8_t> chars;
			CameraMetadata meta;
			int32_t charKeys[] = { ANDROID_DEPTH_DEPTH_IS_EXCLUSIVE,
			ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS };
			meta.update(ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS, charKeys,
			sizeof(charKeys) / sizeof(charKeys[0]));
			uint8_t depthIsExclusive = ANDROID_DEPTH_DEPTH_IS_EXCLUSIVE_FALSE;
			meta.update(ANDROID_DEPTH_DEPTH_IS_EXCLUSIVE, &depthIsExclusive, 1);
			int32_t sizes[] = { HAL_PIXEL_FORMAT_BLOB,
			640, 480, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT };
			meta.update(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, sizes,
			sizeof(sizes) / sizeof(sizes[0]));
			sizes[0] = HAL_PIXEL_FORMAT_Y16;
			meta.update(ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS, sizes,
			sizeof(sizes) / sizeof(sizes[0]));
			int64_t durations[] = { HAL_PIXEL_FORMAT_BLOB, 640, 480, 0 };
			meta.update(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS, durations,
			sizeof(durations) / sizeof(durations[0]));
			meta.update(ANDROID_SCALER_AVAILABLE_STALL_DURATIONS, durations,
			sizeof(durations) / sizeof(durations[0]));
			durations[0]= HAL_PIXEL_FORMAT_Y16;
			meta.update(ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS, durations,
			sizeof(durations) / sizeof(durations[0]));
			meta.update(ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS, durations,
			sizeof(durations) / sizeof(durations[0]));
			camera_metadata_t* metaBuffer = const_cast<camera_metadata_t*>(meta.getAndLock());
			chars.setToExternal(reinterpret_cast<uint8_t*>(metaBuffer),
			get_camera_metadata_size(metaBuffer));

			sp<TestICameraProvider> provider = new TestICameraProvider(deviceNames,
			vendorSection, chars);
			serviceProxy.setProvider(provider);

			res = providerManager->initialize(statusListener, &serviceProxy);
			ASSERT_EQ(res, OK) << "Unable to initialize provider manager";
			}

	TEST(CameraProviderManagerTest, InitializeTest) {		TEST(CameraProviderManagerTest, InitializeTest) {
	std::vector<hardware::hidl_string> deviceNames;		std::vector<hardware::hidl_string> deviceNames;
	deviceNames.push_back("device@3.2/test/0");		deviceNames.push_back("device@3.2/test/0");

services/camera/libcameraservice/tests/RotateAndCropMapperTest.cpp

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -38,10 +38,9 @@ using ::testing::Le;

	#define EXPECT_EQUAL_WITHIN_N(vec, array, N, msg) \		#define EXPECT_EQUAL_WITHIN_N(vec, array, N, msg) \
	{ \		{ \
	std::vector<int32_t> vec_diff; \		for (size_t i = 0; i < vec.size(); i++) { \
	std::transform(vec.begin(), vec.end(), array, \		EXPECT_THAT(vec[i] - array[i], AllOf(Ge(-N), Le(N))) << msg " failed at index:" << i; \
	std::back_inserter(vec_diff), std::minus()); \		} \
	EXPECT_THAT(vec_diff, Each(AllOf(Ge(-N), Le(N)))) << msg; \
	}		}

	int32_t testActiveArray[] = {100, 100, 4000, 3000};		int32_t testActiveArray[] = {100, 100, 4000, 3000};