Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev

Browse Source 
* commit 'e32e311a1159d03cda7791880bb5a32ca1d5e37f':
  Camera2: fix Face class java doc build break
This commit is contained in:
Zhijun He
2013-10-07 15:12:19 -07:00
committed by Android Git Automerger
parent 9d1383c61c e32e311a11
commit da7a00a208
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/camera2/Face.java
View File

@@ -58,7 +58,7 @@ public final class Face {
* Create a new face with all fields set. * Create a new face with all fields set.
* *
* <p>The id, leftEyePosition, rightEyePosition, and mouthPosition are considered optional. * <p>The id, leftEyePosition, rightEyePosition, and mouthPosition are considered optional.
* They are only required when the {@link #CaptureResult} reports that the value of key * They are only required when the {@link CaptureResult} reports that the value of key
* {@link CaptureResult#STATISTICS_FACE_DETECT_MODE} is * {@link CaptureResult#STATISTICS_FACE_DETECT_MODE} is
* {@link CameraMetadata#STATISTICS_FACE_DETECT_MODE_FULL}. * {@link CameraMetadata#STATISTICS_FACE_DETECT_MODE_FULL}.
* If the id is {@value #ID_UNSUPPORTED} then the leftEyePosition, rightEyePosition, and * If the id is {@value #ID_UNSUPPORTED} then the leftEyePosition, rightEyePosition, and
@@ -112,7 +112,7 @@ public final class Face {
* mouthPositions are guaranteed to be {@code null}. Otherwise, each of leftEyePosition, * mouthPositions are guaranteed to be {@code null}. Otherwise, each of leftEyePosition,
* rightEyePosition, and mouthPosition may be independently null or not-null. When devices * rightEyePosition, and mouthPosition may be independently null or not-null. When devices
* report the value of key {@link CaptureResult#STATISTICS_FACE_DETECT_MODE} as * report the value of key {@link CaptureResult#STATISTICS_FACE_DETECT_MODE} as
* {@link CameraMetadata#STATISTICS_FACE_DETECT_MODE_SIMPLE} in {@link #CaptureResult}, * {@link CameraMetadata#STATISTICS_FACE_DETECT_MODE_SIMPLE} in {@link CaptureResult},
* the face id of each face is expected to be {@value #ID_UNSUPPORTED}, the leftEyePosition, * the face id of each face is expected to be {@value #ID_UNSUPPORTED}, the leftEyePosition,
* rightEyePosition, and mouthPositions are expected to be {@code null} for each face.</p> * rightEyePosition, and mouthPositions are expected to be {@code null} for each face.</p>
* *
@@ -177,7 +177,7 @@ public final class Face {
* mouthPositions are guaranteed to be {@code null}. Otherwise, each of leftEyePosition, * mouthPositions are guaranteed to be {@code null}. Otherwise, each of leftEyePosition,
* rightEyePosition, and mouthPosition may be independently null or not-null. When devices * rightEyePosition, and mouthPosition may be independently null or not-null. When devices
* report the value of key {@link CaptureResult#STATISTICS_FACE_DETECT_MODE} as * report the value of key {@link CaptureResult#STATISTICS_FACE_DETECT_MODE} as
* {@link CameraMetadata#STATISTICS_FACE_DETECT_MODE_SIMPLE} in {@link #CaptureResult}, * {@link CameraMetadata#STATISTICS_FACE_DETECT_MODE_SIMPLE} in {@link CaptureResult},
* the face id of each face is expected to be {@value #ID_UNSUPPORTED}.</p> * the face id of each face is expected to be {@value #ID_UNSUPPORTED}.</p>
* *
* <p>This value will either be {@value #ID_UNSUPPORTED} or * <p>This value will either be {@value #ID_UNSUPPORTED} or