diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-04-15 17:56:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 17:56:39 +0000 |
| commit | e9e5a162c0740a311f53a53732254c64dc197d92 (patch) | |
| tree | 5f9dc8789df4bfa33d459b7353edf2e05b450427 /api | |
| parent | ad83f87bcfc4f3ee4bcc972bad4ddcaaf4e57426 (diff) | |
| parent | ad916f7fd3fbb202f2993fea04b0bdad3dcd6de6 (diff) | |
| download | frameworks_base-e9e5a162c0740a311f53a53732254c64dc197d92.zip frameworks_base-e9e5a162c0740a311f53a53732254c64dc197d92.tar.gz frameworks_base-e9e5a162c0740a311f53a53732254c64dc197d92.tar.bz2 | |
Merge "Camera2: Add prepare method for output buffer pre-allocation"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 8f87163..818114d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13056,6 +13056,7 @@ package android.hardware.camera2 { method public abstract android.hardware.camera2.CameraDevice getDevice(); method public abstract android.view.Surface getInputSurface(); method public abstract boolean isReprocessible(); + method public abstract void prepare(android.view.Surface) throws android.hardware.camera2.CameraAccessException; method public abstract int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException; @@ -13078,6 +13079,7 @@ package android.hardware.camera2 { method public abstract void onConfigureFailed(android.hardware.camera2.CameraCaptureSession); method public abstract void onConfigured(android.hardware.camera2.CameraCaptureSession); method public void onReady(android.hardware.camera2.CameraCaptureSession); + method public void onSurfacePrepared(android.hardware.camera2.CameraCaptureSession, android.view.Surface); } public final class CameraCharacteristics extends android.hardware.camera2.CameraMetadata { @@ -57345,4 +57347,3 @@ package org.xmlpull.v1.sax2 { } } - diff --git a/api/system-current.txt b/api/system-current.txt index a9a5211..bef85ad 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -13352,6 +13352,7 @@ package android.hardware.camera2 { method public abstract android.hardware.camera2.CameraDevice getDevice(); method public abstract android.view.Surface getInputSurface(); method public abstract boolean isReprocessible(); + method public abstract void prepare(android.view.Surface) throws android.hardware.camera2.CameraAccessException; method public abstract int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException; @@ -13374,6 +13375,7 @@ package android.hardware.camera2 { method public abstract void onConfigureFailed(android.hardware.camera2.CameraCaptureSession); method public abstract void onConfigured(android.hardware.camera2.CameraCaptureSession); method public void onReady(android.hardware.camera2.CameraCaptureSession); + method public void onSurfacePrepared(android.hardware.camera2.CameraCaptureSession, android.view.Surface); } public final class CameraCharacteristics extends android.hardware.camera2.CameraMetadata { @@ -60223,4 +60225,3 @@ package org.xmlpull.v1.sax2 { } } - |