summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-05-21 10:07:08 -0700
committerIgor Murashkin <iam@google.com>2014-05-27 11:25:24 -0700
commitdb075afc85b6b50a5d3a988a17ed0d4e09ef0823 (patch)
tree4b11bcc6012a28a6a92d24c79a5817e8116799ca /api
parent5d0045835b0bfd456b9400be1cacdc8cb16d6cc7 (diff)
downloadframeworks_base-db075afc85b6b50a5d3a988a17ed0d4e09ef0823.zip
frameworks_base-db075afc85b6b50a5d3a988a17ed0d4e09ef0823.tar.gz
frameworks_base-db075afc85b6b50a5d3a988a17ed0d4e09ef0823.tar.bz2
camera2: Add partial results to the capture listener (API change)
* Also adds capture sequence aborted callback Bug: 12492876 Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
Diffstat (limited to 'api')
-rw-r--r--api/current.txt18
1 files changed, 13 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt
index 812dfc4..4a538c0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12140,9 +12140,11 @@ package android.hardware.camera2 {
public static abstract class CameraCaptureSession.CaptureListener {
ctor public CameraCaptureSession.CaptureListener();
- method public void onCaptureCompleted(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureResult);
+ method public void onCaptureCompleted(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.TotalCaptureResult);
method public void onCaptureFailed(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureFailure);
- method public void onCaptureSequenceCompleted(android.hardware.camera2.CameraDevice, int, int);
+ method public void onCaptureProgressed(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureResult);
+ method public void onCaptureSequenceAborted(android.hardware.camera2.CameraDevice, int);
+ method public void onCaptureSequenceCompleted(android.hardware.camera2.CameraDevice, int, long);
method public void onCaptureStarted(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, long);
}
@@ -12249,9 +12251,11 @@ package android.hardware.camera2 {
public static abstract deprecated class CameraDevice.CaptureListener {
ctor public CameraDevice.CaptureListener();
- method public void onCaptureCompleted(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureResult);
+ method public void onCaptureCompleted(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.TotalCaptureResult);
method public void onCaptureFailed(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureFailure);
- method public void onCaptureSequenceCompleted(android.hardware.camera2.CameraDevice, int, int);
+ method public void onCaptureProgressed(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, android.hardware.camera2.CaptureResult);
+ method public void onCaptureSequenceAborted(android.hardware.camera2.CameraDevice, int);
+ method public void onCaptureSequenceCompleted(android.hardware.camera2.CameraDevice, int, long);
method public void onCaptureStarted(android.hardware.camera2.CameraDevice, android.hardware.camera2.CaptureRequest, long);
}
@@ -12542,7 +12546,7 @@ package android.hardware.camera2 {
method public final int hashCode();
}
- public final class CaptureResult extends android.hardware.camera2.CameraMetadata {
+ public class CaptureResult extends android.hardware.camera2.CameraMetadata {
method public T get(android.hardware.camera2.CaptureResult.Key<T>);
method public int getFrameNumber();
method public android.hardware.camera2.CaptureRequest getRequest();
@@ -12635,6 +12639,10 @@ package android.hardware.camera2 {
method public void writeInputStream(java.io.OutputStream, android.util.Size, java.io.InputStream, long) throws java.io.IOException;
}
+ public final class TotalCaptureResult extends android.hardware.camera2.CaptureResult {
+ method public java.util.List<android.hardware.camera2.CaptureResult> getPartialResults();
+ }
+
}
package android.hardware.camera2.params {