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

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

Merge "Camera: Allow reprocessing session to configure physical streams" into... 

Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178 am: a616d5d7

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

Change-Id: I7ca6e6dde7beb105b22e1423f0a72951209b7955
parents 134c68bb a616d5d7

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+0 −12
Original line number Original line Diff line number Diff line
@@ -1154,7 +1154,6 @@ public class CameraDeviceImpl extends CameraDevice 
            checkIfCameraClosedOrInError();

            checkIfCameraClosedOrInError();





            // Make sure that there all requests have at least 1 surface; all surfaces are non-null;

            // Make sure that there all requests have at least 1 surface; all surfaces are non-null;

            // the surface isn't a physical stream surface for reprocessing request

            for (CaptureRequest request : requestList) {

            for (CaptureRequest request : requestList) {

                if (request.getTargets().isEmpty()) {

                if (request.getTargets().isEmpty()) {

                    throw new IllegalArgumentException(

                    throw new IllegalArgumentException(
@@ -1165,17 +1164,6 @@ public class CameraDeviceImpl extends CameraDevice 
                    if (surface == null) {

                    if (surface == null) {

                        throw new IllegalArgumentException("Null Surface targets are not allowed");

                        throw new IllegalArgumentException("Null Surface targets are not allowed");

                    }

                    }



                    for (int i = 0; i < mConfiguredOutputs.size(); i++) {

                        OutputConfiguration configuration = mConfiguredOutputs.valueAt(i);

                        if (configuration.isForPhysicalCamera()

                                && configuration.getSurfaces().contains(surface)) {

                            if (request.isReprocess()) {

                                throw new IllegalArgumentException(

                                        "Reprocess request on physical stream is not allowed");

                            }

                        }

                    }

                }

                }

            }

            }