Merge "Camera2: Add rollingShutterSkew tag"
diff --git a/api/current.txt b/api/current.txt
index 941eb5b..b7a4a3e0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12663,6 +12663,7 @@
field public static final android.hardware.camera2.CaptureResult.Key SENSOR_FRAME_DURATION;
field public static final android.hardware.camera2.CaptureResult.Key SENSOR_GREEN_SPLIT;
field public static final android.hardware.camera2.CaptureResult.Key SENSOR_NEUTRAL_COLOR_POINT;
+ field public static final android.hardware.camera2.CaptureResult.Key SENSOR_ROLLING_SHUTTER_SKEW;
field public static final android.hardware.camera2.CaptureResult.Key SENSOR_SENSITIVITY;
field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TEST_PATTERN_DATA;
field public static final android.hardware.camera2.CaptureResult.Key SENSOR_TEST_PATTERN_MODE;
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index 3d17ed3..01fea54 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -2114,7 +2114,7 @@
/**
* <p>Time at start of exposure of first
- * row of the image sensor, in nanoseconds.</p>
+ * row of the image sensor active array, in nanoseconds.</p>
* <p>The timestamps are also included in all image
* buffers produced for the same capture, and will be identical
* on all the outputs. The timestamps measure time since an
@@ -2215,6 +2215,20 @@
new Key<Integer>("android.sensor.testPatternMode", int.class);
/**
+ * <p>Duration between the start of first row exposure
+ * and the start of last row exposure.</p>
+ * <p>This is the exposure time skew (in the unit of nanosecond) between the first and
+ * last row exposure start times. The first row and the last row are the first
+ * and last rows inside of the {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p>
+ * <p>For typical camera sensors that use rolling shutters, this is also equivalent
+ * to the frame readout time.</p>
+ *
+ * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE
+ */
+ public static final Key<Long> SENSOR_ROLLING_SHUTTER_SKEW =
+ new Key<Long>("android.sensor.rollingShutterSkew", long.class);
+
+ /**
* <p>Quality of lens shading correction applied
* to the image data.</p>
* <p>When set to OFF mode, no lens shading correction will be applied by the