diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 8b5bf4a0abf3d..3f9b9e91caa6b 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -303,13 +303,14 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { *
** Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. + * xmax, ymax, weight. The rectangle is defined inclusive of the + * specified coordinates. *
* The coordinate system is based on the active pixel array, - * with (0,0) being the top-left of the active pixel array, and - * (android.sensor.info.activeArraySize.width, - * android.sensor.info.activeArraySize.height) being the - * bottom-right point of the active pixel array. The weight + * with (0,0) being the top-left pixel in the active pixel array, and + * (android.sensor.info.activeArraySize.width - 1, + * android.sensor.info.activeArraySize.height - 1) being the + * bottom-right pixel in the active pixel array. The weight * should be nonnegative. *
* If all regions have 0 weight, then no specific metering area @@ -378,13 +379,14 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { *
** Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. + * xmax, ymax, weight. The rectangle is defined inclusive of the + * specified coordinates. *
* The coordinate system is based on the active pixel array, - * with (0,0) being the top-left of the active pixel array, and - * (android.sensor.info.activeArraySize.width, - * android.sensor.info.activeArraySize.height) being the - * bottom-right point of the active pixel array. The weight + * with (0,0) being the top-left pixel in the active pixel array, and + * (android.sensor.info.activeArraySize.width - 1, + * android.sensor.info.activeArraySize.height - 1) being the + * bottom-right pixel in the active pixel array. The weight * should be nonnegative. *
* If all regions have 0 weight, then no specific focus area @@ -462,12 +464,15 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { *
* Only used in AUTO mode. *
- * Each area is a rectangle plus weight: xmin, ymin, xmax, - * ymax, weight. The coordinate system is based on the active - * pixel array, with (0,0) being the top-left of the active - * pixel array, and (android.sensor.info.activeArraySize.width, - * android.sensor.info.activeArraySize.height) being the - * bottom-right point of the active pixel array. The weight + * Each area is a rectangle plus weight: xmin, ymin, + * xmax, ymax, weight. The rectangle is defined inclusive of the + * specified coordinates. + *
+ * The coordinate system is based on the active pixel array, + * with (0,0) being the top-left pixel in the active pixel array, and + * (android.sensor.info.activeArraySize.width - 1, + * android.sensor.info.activeArraySize.height - 1) being the + * bottom-right pixel in the active pixel array. The weight * should be nonnegative. *
* If all regions have 0 weight, then no specific metering area diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index ef6aaa0e71633..bd151a2272122 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -198,13 +198,14 @@ public final class CaptureResult extends CameraMetadata { *
** Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. + * xmax, ymax, weight. The rectangle is defined inclusive of the + * specified coordinates. *
* The coordinate system is based on the active pixel array, - * with (0,0) being the top-left of the active pixel array, and - * (android.sensor.info.activeArraySize.width, - * android.sensor.info.activeArraySize.height) being the - * bottom-right point of the active pixel array. The weight + * with (0,0) being the top-left pixel in the active pixel array, and + * (android.sensor.info.activeArraySize.width - 1, + * android.sensor.info.activeArraySize.height - 1) being the + * bottom-right pixel in the active pixel array. The weight * should be nonnegative. *
* If all regions have 0 weight, then no specific metering area @@ -258,13 +259,14 @@ public final class CaptureResult extends CameraMetadata { *
** Each area is a rectangle plus weight: xmin, ymin, - * xmax, ymax, weight. + * xmax, ymax, weight. The rectangle is defined inclusive of the + * specified coordinates. *
* The coordinate system is based on the active pixel array, - * with (0,0) being the top-left of the active pixel array, and - * (android.sensor.info.activeArraySize.width, - * android.sensor.info.activeArraySize.height) being the - * bottom-right point of the active pixel array. The weight + * with (0,0) being the top-left pixel in the active pixel array, and + * (android.sensor.info.activeArraySize.width - 1, + * android.sensor.info.activeArraySize.height - 1) being the + * bottom-right pixel in the active pixel array. The weight * should be nonnegative. *
* If all regions have 0 weight, then no specific focus area @@ -342,12 +344,15 @@ public final class CaptureResult extends CameraMetadata { *
* Only used in AUTO mode. *
- * Each area is a rectangle plus weight: xmin, ymin, xmax, - * ymax, weight. The coordinate system is based on the active - * pixel array, with (0,0) being the top-left of the active - * pixel array, and (android.sensor.info.activeArraySize.width, - * android.sensor.info.activeArraySize.height) being the - * bottom-right point of the active pixel array. The weight + * Each area is a rectangle plus weight: xmin, ymin, + * xmax, ymax, weight. The rectangle is defined inclusive of the + * specified coordinates. + *
+ * The coordinate system is based on the active pixel array, + * with (0,0) being the top-left pixel in the active pixel array, and + * (android.sensor.info.activeArraySize.width - 1, + * android.sensor.info.activeArraySize.height - 1) being the + * bottom-right pixel in the active pixel array. The weight * should be nonnegative. *
* If all regions have 0 weight, then no specific metering area