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

Commit 9f119121 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Consider no constraints case JpegRComposite streams" into... 

Merge "Camera: Consider no constraints case JpegRComposite streams" into udc-dev am: f4cff0ec am: 5c7f47c8

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



Change-Id: I3c261cddc8c268bdf1f1ae10710b695331fafb73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c97a6e5 5c7f47c8

services/camera/libcameraservice/common/CameraProviderManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ bool CameraProviderManager::isConcurrentDynamicRangeCaptureSupported( 


    for (size_t i = 0; i < entry.count; i += 3) {

        if (entry.data.i64[i] == profile) {

            if (entry.data.i64[i+1] & concurrentProfile) {

            if ((entry.data.i64[i+1] == 0) || (entry.data.i64[i+1] & concurrentProfile)) {

                return true;

            }

        }