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

Commit 9f9bb3b7 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

RESTRICT AUTOMERGE: Camera: Hide keys for the rotate-and-crop controls 

Implementation is not complete yet, so hide the feature for now.

Test: Adjusted camera CTS continues to pass
Bug: 150036107
Change-Id: Ifc49766d3e7ebd5a785424cf9a59e9c0f805aabc
parent 5eed7459

api/current.txt

+0 −8
Original line number Diff line number Diff line
@@ -17270,7 +17270,6 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_PARTIAL_RESULT_COUNT;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> REQUEST_PIPELINE_MAX_DEPTH;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SCALER_AVAILABLE_ROTATE_AND_CROP_MODES;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SCALER_CROPPING_TYPE;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_STREAM_COMBINATIONS;
@@ -17554,11 +17553,6 @@ package android.hardware.camera2 { 
    field public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7; // 0x7

    field public static final int SCALER_CROPPING_TYPE_CENTER_ONLY = 0; // 0x0

    field public static final int SCALER_CROPPING_TYPE_FREEFORM = 1; // 0x1

    field public static final int SCALER_ROTATE_AND_CROP_180 = 2; // 0x2

    field public static final int SCALER_ROTATE_AND_CROP_270 = 3; // 0x3

    field public static final int SCALER_ROTATE_AND_CROP_90 = 1; // 0x1

    field public static final int SCALER_ROTATE_AND_CROP_AUTO = 4; // 0x4

    field public static final int SCALER_ROTATE_AND_CROP_NONE = 0; // 0x0

    field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_BGGR = 3; // 0x3

    field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_GBRG = 2; // 0x2

    field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_GRBG = 1; // 0x1
@@ -17694,7 +17688,6 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> NOISE_REDUCTION_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<android.graphics.Rect> SCALER_CROP_REGION;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> SCALER_ROTATE_AND_CROP;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Long> SENSOR_EXPOSURE_TIME;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Long> SENSOR_FRAME_DURATION;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> SENSOR_SENSITIVITY;
@@ -17791,7 +17784,6 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> REQUEST_PIPELINE_DEPTH;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Rect> SCALER_CROP_REGION;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> SCALER_ROTATE_AND_CROP;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<float[]> SENSOR_DYNAMIC_BLACK_LEVEL;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> SENSOR_DYNAMIC_WHITE_LEVEL;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Long> SENSOR_EXPOSURE_TIME;

core/java/android/hardware/camera2/CameraCharacteristics.java

+5 −8
Original line number Diff line number Diff line
@@ -2883,19 +2883,16 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
            new Key<android.hardware.camera2.params.MandatoryStreamCombination[]>("android.scaler.mandatoryConcurrentStreamCombinations", android.hardware.camera2.params.MandatoryStreamCombination[].class);



    /**

     * <p>List of rotate-and-crop modes for {@link CaptureRequest#SCALER_ROTATE_AND_CROP android.scaler.rotateAndCrop} that are supported by this camera device.</p>

     * <p>This entry lists the valid modes for {@link CaptureRequest#SCALER_ROTATE_AND_CROP android.scaler.rotateAndCrop} for this camera device.</p>

     * <p>Starting with API level 30, all devices will list at least <code>ROTATE_AND_CROP_NONE</code>.

     * <p>List of rotate-and-crop modes for android.scaler.rotateAndCrop that are supported by this camera device.</p>

     * <p>This entry lists the valid modes for android.scaler.rotateAndCrop for this camera device.</p>

     * <p>Starting at some future API level, all devices will list at least <code>ROTATE_AND_CROP_NONE</code>.

     * Devices with support for rotate-and-crop will additionally list at least

     * <code>ROTATE_AND_CROP_AUTO</code> and <code>ROTATE_AND_CROP_90</code>.</p>

     * <p><b>Range of valid values:</b><br>

     * Any value listed in {@link CaptureRequest#SCALER_ROTATE_AND_CROP android.scaler.rotateAndCrop}</p>

     * Any value listed in android.scaler.rotateAndCrop</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     *

     * @see CaptureRequest#SCALER_ROTATE_AND_CROP

     * @hide

     */

    @PublicKey

    @NonNull

    public static final Key<int[]> SCALER_AVAILABLE_ROTATE_AND_CROP_MODES =

            new Key<int[]>("android.scaler.availableRotateAndCropModes", int[].class);

core/java/android/hardware/camera2/CameraMetadata.java

+5 −0
Original line number Diff line number Diff line
@@ -2756,6 +2756,7 @@ public abstract class CameraMetadata<TKey> { 
    /**

     * <p>No rotate and crop is applied. Processed outputs are in the sensor orientation.</p>

     * @see CaptureRequest#SCALER_ROTATE_AND_CROP

     * @hide

     */

    public static final int SCALER_ROTATE_AND_CROP_NONE = 0;
@@ -2763,6 +2764,7 @@ public abstract class CameraMetadata<TKey> { 
     * <p>Processed images are rotated by 90 degrees clockwise, and then cropped

     * to the original aspect ratio.</p>

     * @see CaptureRequest#SCALER_ROTATE_AND_CROP

     * @hide

     */

    public static final int SCALER_ROTATE_AND_CROP_90 = 1;
@@ -2770,6 +2772,7 @@ public abstract class CameraMetadata<TKey> { 
     * <p>Processed images are rotated by 180 degrees.  Since the aspect ratio does not

     * change, no cropping is performed.</p>

     * @see CaptureRequest#SCALER_ROTATE_AND_CROP

     * @hide

     */

    public static final int SCALER_ROTATE_AND_CROP_180 = 2;
@@ -2777,6 +2780,7 @@ public abstract class CameraMetadata<TKey> { 
     * <p>Processed images are rotated by 270 degrees clockwise, and then cropped

     * to the original aspect ratio.</p>

     * @see CaptureRequest#SCALER_ROTATE_AND_CROP

     * @hide

     */

    public static final int SCALER_ROTATE_AND_CROP_270 = 3;
@@ -2796,6 +2800,7 @@ public abstract class CameraMetadata<TKey> { 
     * coordinate system to make the operation transparent for applications.</p>

     * <p>No coordinate mapping will be done when the application selects a non-AUTO mode.</p>

     * @see CaptureRequest#SCALER_ROTATE_AND_CROP

     * @hide

     */

    public static final int SCALER_ROTATE_AND_CROP_AUTO = 4;

core/java/android/hardware/camera2/CaptureRequest.java

+2 −4
Original line number Diff line number Diff line
@@ -2916,14 +2916,13 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     *   <li>{@link #SCALER_ROTATE_AND_CROP_AUTO AUTO}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#SCALER_AVAILABLE_ROTATE_AND_CROP_MODES android.scaler.availableRotateAndCropModes}</p>

     * android.scaler.availableRotateAndCropModes</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     *

     * @see CaptureRequest#CONTROL_AE_REGIONS

     * @see CaptureRequest#CONTROL_AF_REGIONS

     * @see CaptureRequest#CONTROL_AWB_REGIONS

     * @see CaptureRequest#CONTROL_ZOOM_RATIO

     * @see CameraCharacteristics#SCALER_AVAILABLE_ROTATE_AND_CROP_MODES

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CaptureResult#STATISTICS_FACES

     * @see #SCALER_ROTATE_AND_CROP_NONE
@@ -2931,9 +2930,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * @see #SCALER_ROTATE_AND_CROP_180

     * @see #SCALER_ROTATE_AND_CROP_270

     * @see #SCALER_ROTATE_AND_CROP_AUTO

     * @hide

     */

    @PublicKey

    @NonNull

    public static final Key<Integer> SCALER_ROTATE_AND_CROP =

            new Key<Integer>("android.scaler.rotateAndCrop", int.class);

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

+2 −4
Original line number Diff line number Diff line
@@ -3562,14 +3562,13 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *   <li>{@link #SCALER_ROTATE_AND_CROP_AUTO AUTO}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#SCALER_AVAILABLE_ROTATE_AND_CROP_MODES android.scaler.availableRotateAndCropModes}</p>

     * android.scaler.availableRotateAndCropModes</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     *

     * @see CaptureRequest#CONTROL_AE_REGIONS

     * @see CaptureRequest#CONTROL_AF_REGIONS

     * @see CaptureRequest#CONTROL_AWB_REGIONS

     * @see CaptureRequest#CONTROL_ZOOM_RATIO

     * @see CameraCharacteristics#SCALER_AVAILABLE_ROTATE_AND_CROP_MODES

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CaptureResult#STATISTICS_FACES

     * @see #SCALER_ROTATE_AND_CROP_NONE
@@ -3577,9 +3576,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * @see #SCALER_ROTATE_AND_CROP_180

     * @see #SCALER_ROTATE_AND_CROP_270

     * @see #SCALER_ROTATE_AND_CROP_AUTO

     * @hide

     */

    @PublicKey

    @NonNull

    public static final Key<Integer> SCALER_ROTATE_AND_CROP =

            new Key<Integer>("android.scaler.rotateAndCrop", int.class);