diff options
| author | 2020-06-19 20:46:04 +0000 | |
|---|---|---|
| committer | 2020-06-19 20:46:04 +0000 | |
| commit | 861a8178f9c8032f84604d2799011ed98a353893 (patch) | |
| tree | 4f49dc8af7e0da1931c5870a8ae7fd0e7713ed80 | |
| parent | 6c8c9ea8cb1c86911f508e1d04f7133104d6744e (diff) | |
| parent | 84a475a20f6ceaa2d0456c21f96535aa639d5827 (diff) | |
Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraDeviceImpl.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index bfc7f37aaf8d..e21b45ab6577 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -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"); - } - } - } } } |