summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorYin-Chia Yeh <yinchiayeh@google.com>2014-06-04 16:11:10 -0700
committerYin-Chia Yeh <yinchiayeh@google.com>2014-06-05 11:34:48 -0700
commit83a9e4d86407d627f3f6fbf8757d2a389097ab6f (patch)
tree9b723014a9e8c8831e59e7538b800135514f1acd /core/java/android/hardware
parenta335e14b6bcb71920f34a968ebc88a40ba116002 (diff)
downloadframeworks_base-83a9e4d86407d627f3f6fbf8757d2a389097ab6f.zip
frameworks_base-83a9e4d86407d627f3f6fbf8757d2a389097ab6f.tar.gz
frameworks_base-83a9e4d86407d627f3f6fbf8757d2a389097ab6f.tar.bz2
Camera2: Do not hide TonemapCurve construtor
Do not @hide TonemapCurve constructor since it's also a control key. bug: 14628001 Change-Id: I17384f42f5c2db2371d1c09030d04a1b9637045e
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/params/TonemapCurve.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/hardware/camera2/params/TonemapCurve.java b/core/java/android/hardware/camera2/params/TonemapCurve.java
index 0fcffac..481d67a 100644
--- a/core/java/android/hardware/camera2/params/TonemapCurve.java
+++ b/core/java/android/hardware/camera2/params/TonemapCurve.java
@@ -78,7 +78,7 @@ public final class TonemapCurve {
/**
* Create a new immutable TonemapCurve instance.
*
- * <p>Values are stored as a contiguous {@code (Pin, Pout}) point.</p>
+ * <p>Values are stored as a contiguous array of {@code (Pin, Pout)} points.</p>
*
* <p>All parameters may have independent length but should have at most
* {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS} * {@value #POINT_SIZE} elements.</p>
@@ -88,15 +88,16 @@ public final class TonemapCurve {
*
* <p>This constructor copies the array contents and does not retain ownership of the array.</p>
*
- * @param elements An array of elements whose length is {@code CHANNEL_COUNT * rows * columns}
+ * @param red An array of elements whose length is divisible by {@value #POINT_SIZE}
+ * @param green An array of elements whose length is divisible by {@value #POINT_SIZE}
+ * @param blue An array of elements whose length is divisible by {@value #POINT_SIZE}
*
* @throws IllegalArgumentException
- * if the {@code elements} array length is invalid,
- * if any of the subelems are not finite
+ * if any of input array length is invalid,
+ * or if any of the elements in the array are not in the range of
+ * [{@value #LEVEL_BLACK}, {@value #LEVEL_WHITE}]
* @throws NullPointerException
- * if any of the parameters is {@code null}
- *
- * @hide
+ * if any of the parameters are {@code null}
*/
public TonemapCurve(float[] red, float[] green, float[] blue) {
// TODO: maxCurvePoints check?