commit b94ff28527e7d2a826992d83de1961114bab136f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 30 19:56:58 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 30 19:56:58 2019 +0000
tree 583b4adf4e192133ea5eaf406bdf30baabcea42b
parent 8c886ae968a80321f0269825f186c75853645d61
parent ea0bf32a189b3998880181118caf6016ed4b7d0f

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

services/camera/libcameraservice/common/DepthPhotoProcessor.cpp

diff --git a/services/camera/libcameraservice/common/DepthPhotoProcessor.cpp b/services/camera/libcameraservice/common/DepthPhotoProcessor.cpp
index 3c90de0..94541d8 100644
--- a/services/camera/libcameraservice/common/DepthPhotoProcessor.cpp
+++ b/services/camera/libcameraservice/common/DepthPhotoProcessor.cpp
@@ -419,7 +419,7 @@
 
     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__);