Merge "Camera: Update depth photo container item MIME type" into qt-r1-dev am: b94ff28527 am: a18f033c09

am: fd4da0e171

Change-Id: Ie783cf873c9d3e480e66817cac06d8fcd7a40836

services/camera/libcameraservice/common/DepthPhotoProcessor.cpp

@@ -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__);