Camera2: update generated code

To solve the cherry-pick out of order issue.

Change-Id: If74a87005914dcd3fd15808482fcac4d0f70bae7

diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index 3116e67..a0217c2 100644 (file)
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -424,17 +424,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
             new Key<Rational>("android.control.aeCompensationStep", Rational.class);
 
     /**
-     * <p>Whether the camera device supports {@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock}</p>
-     * <p>LIMITED or FULL devices will always list <code>true</code></p>
-     * <p>This key is available on all devices.</p>
-     *
-     * @see CaptureRequest#CONTROL_AE_LOCK
-     */
-    @PublicKey
-    public static final Key<Boolean> CONTROL_AE_LOCK_AVAILABLE =
-            new Key<Boolean>("android.control.aeLockAvailable", boolean.class);
-
-    /**
      * <p>List of auto-focus (AF) modes for {@link CaptureRequest#CONTROL_AF_MODE android.control.afMode} that are
      * supported by this camera device.</p>
      * <p>Not all the auto-focus modes may be supported by a
@@ -482,22 +471,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
             new Key<int[]>("android.control.availableEffects", int[].class);
 
     /**
-     * <p>List of control modes for {@link CaptureRequest#CONTROL_MODE android.control.mode} that are supported by this camera
-     * device.</p>
-     * <p>This list contains control modes that can be set for the camera device.
-     * LEGACY mode devices will always support AUTO mode. LIMITED and FULL
-     * devices will always support OFF, AUTO modes.</p>
-     * <p><b>Range of valid values:</b><br>
-     * Any value listed in {@link CaptureRequest#CONTROL_MODE android.control.mode}</p>
-     * <p>This key is available on all devices.</p>
-     *
-     * @see CaptureRequest#CONTROL_MODE
-     */
-    @PublicKey
-    public static final Key<int[]> CONTROL_AVAILABLE_MODES =
-            new Key<int[]>("android.control.availableModes", int[].class);
-
-    /**
      * <p>List of scene modes for {@link CaptureRequest#CONTROL_SCENE_MODE android.control.sceneMode} that are supported by this camera
      * device.</p>
      * <p>This list contains scene modes that can be set for the camera device.
@@ -559,17 +532,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
             new Key<int[]>("android.control.awbAvailableModes", int[].class);
 
     /**
-     * <p>Whether the camera device supports {@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock}</p>
-     * <p>LIMITED or FULL devices will always list <code>true</code></p>
-     * <p>This key is available on all devices.</p>
-     *
-     * @see CaptureRequest#CONTROL_AWB_LOCK
-     */
-    @PublicKey
-    public static final Key<Boolean> CONTROL_AWB_LOCK_AVAILABLE =
-            new Key<Boolean>("android.control.awbLockAvailable", boolean.class);
-
-    /**
      * <p>List of the maximum number of regions that can be used for metering in
      * auto-exposure (AE), auto-white balance (AWB), and auto-focus (AF);
      * this corresponds to the the maximum number of elements in