From 3b594bfe338d557b5bd57e9279ed5fc8d70ffea6 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Mon, 31 Jul 2017 09:57:15 -0700 Subject: [PATCH] Camera2: Release input surface on capture session close Per the documentation, the input surface of a reprocessable capture session should be abandoned on the close of a session. Actually implement this, to avoid unintentional leaks of buffers. Test: Camera CTS passes Bug: 38313948 Change-Id: Ia45c39ea925288a5082d6e722ff4b40c55971a37 --- .../hardware/camera2/impl/CameraCaptureSessionImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java index 6825d363b9186..c7654c9e74e18 100644 --- a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java @@ -412,6 +412,9 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession // If no sequences are pending, fire #onClosed immediately mSequenceDrainer.beginDrain(); } + if (mInput != null) { + mInput.release(); + } } /**