diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 20:47:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-19 20:47:17 +0000 |
commit | 76bd691f34d5f9127b5f95e018f4973455a82bb5 (patch) | |
tree | 5701a97e6a2e49261a6b9c80c06e988db8c939ad | |
parent | 0230b93d424bef028fa24ffb9f04d7fca0999425 (diff) | |
parent | 7841de0683821950909641ec5b555b77ee4a7714 (diff) |
Merge "Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9" into rvc-dev-plus-aosp
-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"); - } - } - } } } |