Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb4a5fff authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera2: hide some face related keys"

parents edae6785 7f80d6f7

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -11314,10 +11314,6 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_TIMESTAMP;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACES;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACE_DETECT_MODE;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACE_IDS;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACE_LANDMARKS;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACE_RECTANGLES;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACE_SCORES;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_LENS_SHADING_MAP;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_PREDICTED_COLOR_GAINS;

    field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_PREDICTED_COLOR_TRANSFORM;

core/java/android/hardware/camera2/CaptureResult.java

+8 −0
Original line number Diff line number Diff line
@@ -758,6 +758,8 @@ public final class CaptureResult extends CameraMetadata { 
     * <p>

     * Only available if faceDetectMode == FULL

     * </p>

     *

     * @hide

     */

    public static final Key<int[]> STATISTICS_FACE_IDS =

            new Key<int[]>("android.statistics.faceIds", int[].class);
@@ -770,6 +772,8 @@ public final class CaptureResult extends CameraMetadata { 
     * <p>

     * Only available if faceDetectMode == FULL

     * </p>

     *

     * @hide

     */

    public static final Key<int[]> STATISTICS_FACE_LANDMARKS =

            new Key<int[]>("android.statistics.faceLandmarks", int[].class);
@@ -782,6 +786,8 @@ public final class CaptureResult extends CameraMetadata { 
     * <p>

     * Only available if faceDetectMode != OFF

     * </p>

     *

     * @hide

     */

    public static final Key<android.graphics.Rect[]> STATISTICS_FACE_RECTANGLES =

            new Key<android.graphics.Rect[]>("android.statistics.faceRectangles", android.graphics.Rect[].class);
@@ -795,6 +801,8 @@ public final class CaptureResult extends CameraMetadata { 
     * Only available if faceDetectMode != OFF. The value should be

     * meaningful (for example, setting 100 at all times is illegal).

     * </p>

     *

     * @hide

     */

    public static final Key<byte[]> STATISTICS_FACE_SCORES =

            new Key<byte[]>("android.statistics.faceScores", byte[].class);