summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2015-07-07 22:16:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-07 22:16:10 +0000
commit69421363c6a81a788b963d2f4cb5fdeaa8bd4200 (patch)
treec8d0cf2f82e0a07730a5966fda33474a2d059176 /core/java
parent7a64e9769f8fe5a400320de9ebd025b0b7af045d (diff)
parente0ee63046ad062040aafc977585fb461a2acf666 (diff)
downloadframeworks_base-69421363c6a81a788b963d2f4cb5fdeaa8bd4200.zip
frameworks_base-69421363c6a81a788b963d2f4cb5fdeaa8bd4200.tar.gz
frameworks_base-69421363c6a81a788b963d2f4cb5fdeaa8bd4200.tar.bz2
Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/camera2/CameraCaptureSession.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraCaptureSession.java b/core/java/android/hardware/camera2/CameraCaptureSession.java
index c547b06..62ebfb3 100644
--- a/core/java/android/hardware/camera2/CameraCaptureSession.java
+++ b/core/java/android/hardware/camera2/CameraCaptureSession.java
@@ -497,8 +497,9 @@ public abstract class CameraCaptureSession implements AutoCloseable {
*
* <p>Each reprocessable capture session has an input {@link Surface} where the reprocess
* capture requests get the input images from, rather than the camera device. The application
- * can create a {@link android.media.ImageWriter} with this input {@link Surface} and use it to
- * provide input images for reprocess capture requests.</p>
+ * can create a {@link android.media.ImageWriter ImageWriter} with this input {@link Surface}
+ * and use it to provide input images for reprocess capture requests. When the reprocessable
+ * capture session is closed, the input {@link Surface} is abandoned and becomes invalid.</p>
*
* @return The {@link Surface} where reprocessing capture requests get the input images from. If
* this is not a reprocess capture session, {@code null} will be returned.