Merge "Camera: Update depth photo container item MIME type" into qt-r1-dev am:... (55858b16) · Commits · e / devices / smdk4412 / android_frameworks_av

services/camera/libcameraservice/common/DepthPhotoProcessor.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -419,7 +419,7 @@ extern "C" int processDepthPhotoFrame(DepthPhotoInputFrame inputFrame, size_t de

		std::vector<std::unique_ptr<Item>> items;
		std::vector<std::unique_ptr<Camera>> cameraList;
		auto image = Image::FromDataForPrimaryImage("android/mainimage", &items);
		auto image = Image::FromDataForPrimaryImage("image/jpeg", &items);
		std::unique_ptr<CameraParams> cameraParams(new CameraParams(std::move(image)));
		if (cameraParams == nullptr) {
		ALOGE("%s: Failed to initialize camera parameters", __FUNCTION__);