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

Commit 2ed634c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "cameraserver: fix minor typo" am: f3441c15 am: cd3d99e7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2366368



Change-Id: I36224669875415a53377dd594c2b71bb04c8af1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28fd3361 cd3d99e7

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -947,8 +947,8 @@ binder::Status CameraDeviceClient::createStream( 
    std::vector<int> surfaceIds;

    bool isDepthCompositeStream =

            camera3::DepthCompositeStream::isDepthCompositeStream(surfaces[0]);

    bool isHeicCompisiteStream = camera3::HeicCompositeStream::isHeicCompositeStream(surfaces[0]);

    if (isDepthCompositeStream || isHeicCompisiteStream) {

    bool isHeicCompositeStream = camera3::HeicCompositeStream::isHeicCompositeStream(surfaces[0]);

    if (isDepthCompositeStream || isHeicCompositeStream) {

        sp<CompositeStream> compositeStream;

        if (isDepthCompositeStream) {

            compositeStream = new camera3::DepthCompositeStream(mDevice, getRemoteCallback());