Image Capture Android: bump class to API 23 (Marshmallow) to retrieve fixed-controls

media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.media;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.graphics.Rect;
@@ skipping 25 matching lines @@
 import java.util.List;
 
 /**
  * This class implements Video Capture using Camera2 API, introduced in Android
  * API 21 (L Release). Capture takes place in the current Looper, while pixel
  * download takes place in another thread used by ImageReader. A number of
  * static methods are provided to retrieve information on current system cameras
  * and their capabilities, using android.hardware.camera2.CameraManager.
  **/
 @JNINamespace("media")
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+@TargetApi(Build.VERSION_CODES.M)
 public class VideoCaptureCamera2 extends VideoCapture {
     // Inner class to extend a CameraDevice state change listener.
     private class CrStateListener extends CameraDevice.StateCallback {
         @Override
         public void onOpened(CameraDevice cameraDevice) {
             mCameraDevice = cameraDevice;
             changeCameraStateAndNotify(CameraState.CONFIGURING);
             if (!createPreviewObjects()) {
                 changeCameraStateAndNotify(CameraState.STOPPED);
                 nativeOnError(mNativeVideoCaptureDeviceAndroid, "Error configuring camera");
@@ skipping 741 matching lines @@
         ArrayList<Integer> exposureModes = new ArrayList<Integer>(1);
         for (int mode : jniExposureModes) {
             if (mode == CameraMetadata.CONTROL_AE_MODE_ON
                     || mode == CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH
                     || mode == CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH
                     || mode == CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE) {
                 exposureModes.add(Integer.valueOf(AndroidMeteringMode.CONTINUOUS));
                 break;
             }
         }
-        // TODO(mcasas): query |cameraCharacteristics| for CONTROL_AE_LOCK_AVAILABLE (API 23)
+        if (cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_LOCK_AVAILABLE)) {
+            exposureModes.add(Integer.valueOf(AndroidMeteringMode.FIXED));
+        }
         builder.setExposureModes(integerArrayListToArray(exposureModes));
 
         int jniExposureMode = AndroidMeteringMode.CONTINUOUS;
         if (mPreviewRequest.get(CaptureRequest.CONTROL_AE_MODE)
                 == CameraMetadata.CONTROL_AE_MODE_OFF) {
             jniExposureMode = AndroidMeteringMode.NONE;
         }
         if (mPreviewRequest.get(CaptureRequest.CONTROL_AE_LOCK)) {
             jniExposureMode = AndroidMeteringMode.FIXED;
         }
@@ skipping 12 matching lines @@
 
         final int[] jniWhiteBalanceMode =
                 cameraCharacteristics.get(CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES);
         ArrayList<Integer> whiteBalanceModes = new ArrayList<Integer>(1);
         for (int mode : jniWhiteBalanceMode) {
             if (mode == CameraMetadata.CONTROL_AWB_MODE_AUTO) {
                 whiteBalanceModes.add(Integer.valueOf(AndroidMeteringMode.CONTINUOUS));
                 break;
             }
         }
-        // TODO(mcasas): query |cameraCharacteristics| for CONTROL_AWE_LOCK_AVAILABLE (API 23)
+        if (cameraCharacteristics.get(CameraCharacteristics.CONTROL_AWB_LOCK_AVAILABLE)) {
+            whiteBalanceModes.add(Integer.valueOf(AndroidMeteringMode.FIXED));
+        }
         builder.setWhiteBalanceModes(integerArrayListToArray(whiteBalanceModes));
 
         final int whiteBalanceMode = mPreviewRequest.get(CaptureRequest.CONTROL_AWB_MODE);
         if (whiteBalanceMode == CameraMetadata.CONTROL_AWB_MODE_OFF) {
             builder.setWhiteBalanceMode(AndroidMeteringMode.NONE);
         } else if (whiteBalanceMode == CameraMetadata.CONTROL_AWB_MODE_AUTO) {
             builder.setWhiteBalanceMode(AndroidMeteringMode.CONTINUOUS);
         } else {
             builder.setWhiteBalanceMode(AndroidMeteringMode.FIXED);
         }
@@ skipping 178 matching lines @@
             return false;
         }
         return true;
     }
 
     @Override
     public void deallocate() {
         Log.d(TAG, "deallocate");
     }
 }