summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-02-08 02:22:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-08 02:22:55 +0000
commit672ad888d2e05a85d3127f79932ca37dd9ec172e (patch)
tree62de27ce903389ff553601bdb9c3c016baaf55a0 /api
parentd5fdd1c112b475fbe1f927406c17babead8cb061 (diff)
parent418f6df836c34350118b521f75788ac6ae2fb0ec (diff)
downloadframeworks_base-672ad888d2e05a85d3127f79932ca37dd9ec172e.zip
frameworks_base-672ad888d2e05a85d3127f79932ca37dd9ec172e.tar.gz
frameworks_base-672ad888d2e05a85d3127f79932ca37dd9ec172e.tar.bz2
Merge "camera2: Add android.scaler.availableInputOutputFormatsMap"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index f8aa89b..c360805 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11281,6 +11281,7 @@ package android.hardware.camera2 {
field public static final android.hardware.camera2.CameraMetadata.Key REQUEST_PARTIAL_RESULT_COUNT;
field public static final android.hardware.camera2.CameraMetadata.Key REQUEST_PIPELINE_MAX_DEPTH;
field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_FORMATS;
+ field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP;
field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_JPEG_MIN_DURATIONS;
field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_JPEG_SIZES;
field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;