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

Commit 861a8178 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev

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

            // 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) {
                if (request.getTargets().isEmpty()) {
                    throw new IllegalArgumentException(
@@ -1165,17 +1164,6 @@ public class CameraDeviceImpl extends CameraDevice
                    if (surface == null) {
                        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");
                            }
                        }
                    }
                }
            }