summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-05-27 18:32:18 -0700
committerEino-Ville Talvala <etalvala@google.com>2014-05-28 01:36:53 -0700
commit78712a8bd7275542013ba099f33536eead0167fb (patch)
tree6aea769b59dbe05e6f8dc661081f2afebf53d455 /api
parent817f8933ee1c11130ad2ca45b5ac8ce8b729f125 (diff)
downloadframeworks_base-78712a8bd7275542013ba099f33536eead0167fb.zip
frameworks_base-78712a8bd7275542013ba099f33536eead0167fb.tar.gz
frameworks_base-78712a8bd7275542013ba099f33536eead0167fb.tar.bz2
camera2: Add new metadata keys, change types for existing range keys
Also adds the following keys: * android.control.maxRegionsAe * android.control.maxRegionsAwb * android.control.maxRegionsAf * android.request.maxNumOutputRaw * android.request.maxNumOutputProc * android.request.maxNumOutputProcStalling Changes the following keys' type generations: * android.control.aeTargetFpsRange * (Range<Integer>) * android.control.aeAvailableTargetFpsRanges * (Range<Integer>[]) * android.control.aeCompensationRange * (Range<Integer>) * android.lens.focusRange * (Range<Float>) Bug: 14628001 Change-Id: I141847dffc4b0d89cea37c19a54d6d5faf24a9bb
Diffstat (limited to 'api')
-rw-r--r--api/current.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index db18714..4fbcd8d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12149,7 +12149,9 @@ package android.hardware.camera2 {
field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AVAILABLE_SCENE_MODES;
field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;
field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AWB_AVAILABLE_MODES;
- field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_MAX_REGIONS;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_MAX_REGIONS_AE;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_MAX_REGIONS_AF;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_MAX_REGIONS_AWB;
field public static final android.hardware.camera2.CameraCharacteristics.Key EDGE_AVAILABLE_EDGE_MODES;
field public static final android.hardware.camera2.CameraCharacteristics.Key FLASH_INFO_AVAILABLE;
field public static final android.hardware.camera2.CameraCharacteristics.Key HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
@@ -12167,7 +12169,9 @@ package android.hardware.camera2 {
field public static final android.hardware.camera2.CameraCharacteristics.Key NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;
field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_AVAILABLE_CAPABILITIES;
field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_INPUT_STREAMS;
- field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_STREAMS;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_PROC;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_PROC_STALLING;
+ field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_RAW;
field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_PARTIAL_RESULT_COUNT;
field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_PIPELINE_MAX_DEPTH;
field public static final android.hardware.camera2.CameraCharacteristics.Key SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;