diff options
| author | Igor Murashkin <iam@google.com> | 2014-07-29 22:13:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-29 21:36:00 +0000 |
| commit | 36761644623c7af73cadfe14041f2c9c68a4b8ad (patch) | |
| tree | 08ba2a0a54e002b5849b61eee3c579fea299b095 /api | |
| parent | 5ad92c52781bf69f7e06c38c834421eecd943a23 (diff) | |
| parent | bdf366cc70639b0e16b8f84eebe612a48a8b8b06 (diff) | |
| download | frameworks_base-36761644623c7af73cadfe14041f2c9c68a4b8ad.zip frameworks_base-36761644623c7af73cadfe14041f2c9c68a4b8ad.tar.gz frameworks_base-36761644623c7af73cadfe14041f2c9c68a4b8ad.tar.bz2 | |
Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 639cb75..995b63e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13029,7 +13029,7 @@ package android.hardware.camera2 { public class CaptureResult extends android.hardware.camera2.CameraMetadata { method public T get(android.hardware.camera2.CaptureResult.Key<T>); - method public int getFrameNumber(); + method public long getFrameNumber(); method public android.hardware.camera2.CaptureRequest getRequest(); method public int getSequenceId(); field public static final android.hardware.camera2.CaptureResult.Key BLACK_LEVEL_LOCK; @@ -13075,7 +13075,6 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CaptureResult.Key LENS_OPTICAL_STABILIZATION_MODE; field public static final android.hardware.camera2.CaptureResult.Key LENS_STATE; field public static final android.hardware.camera2.CaptureResult.Key NOISE_REDUCTION_MODE; - field public static final android.hardware.camera2.CaptureResult.Key REQUEST_FRAME_COUNT; field public static final android.hardware.camera2.CaptureResult.Key REQUEST_PIPELINE_DEPTH; field public static final android.hardware.camera2.CaptureResult.Key SCALER_CROP_REGION; field public static final android.hardware.camera2.CaptureResult.Key SENSOR_EXPOSURE_TIME; |