commit 6f1422711b6a133a8d410aab78a734f659648f53
author Eino-Ville Talvala <etalvala@google.com> Mon Jul 31 22:30:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 31 22:30:01 2017 +0000
tree 1009ecc3fc899aac0bed9314152d941c3a45d606
parent 630faa085abc7f89db075983100118169d17fdd9
parent 06802167e5b8c82c07ea69479aadf57f45e8fc15

Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am: 06802167e5

Change-Id: I3370a3c8853d171b29856d2a94e7121e6a5ad1b5

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

diff --git a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java
index 6825d36..c7654c9 100644
--- a/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java
@@ -412,6 +412,9 @@
             // If no sequences are pending, fire #onClosed immediately
             mSequenceDrainer.beginDrain();
         }
+        if (mInput != null) {
+            mInput.release();
+        }
     }
 
     /**