Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd4da0e1 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

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

am: a18f033c

Change-Id: I2a9b9e82eb1f625cbaf83b54aba51a44ace8292b
parents 59640ab7 a18f033c

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