| Index: media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java
|
| diff --git a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java
|
| index ef9726146b158d29aaea2c11827ca6b42a81e54b..aa828a755b9b24b50f1ebc79dbc1f1d6aa94c374 100644
|
| --- a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java
|
| +++ b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java
|
| @@ -805,8 +805,12 @@ public class VideoCaptureCamera2 extends VideoCapture {
|
| break;
|
| }
|
| }
|
| - if (cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_LOCK_AVAILABLE)) {
|
| - exposureModes.add(Integer.valueOf(AndroidMeteringMode.FIXED));
|
| + try {
|
| + if (cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_LOCK_AVAILABLE)) {
|
| + exposureModes.add(Integer.valueOf(AndroidMeteringMode.FIXED));
|
| + }
|
| + } catch (NoSuchFieldError e) {
|
| + // Ignore this exception, it means CONTROL_AE_LOCK_AVAILABLE is not known.
|
| }
|
| builder.setExposureModes(integerArrayListToArray(exposureModes));
|
|
|
| @@ -840,8 +844,12 @@ public class VideoCaptureCamera2 extends VideoCapture {
|
| break;
|
| }
|
| }
|
| - if (cameraCharacteristics.get(CameraCharacteristics.CONTROL_AWB_LOCK_AVAILABLE)) {
|
| - whiteBalanceModes.add(Integer.valueOf(AndroidMeteringMode.FIXED));
|
| + try {
|
| + if (cameraCharacteristics.get(CameraCharacteristics.CONTROL_AWB_LOCK_AVAILABLE)) {
|
| + whiteBalanceModes.add(Integer.valueOf(AndroidMeteringMode.FIXED));
|
| + }
|
| + } catch (NoSuchFieldError e) {
|
| + // Ignore this exception, it means CONTROL_AWB_LOCK_AVAILABLE is not known.
|
| }
|
| builder.setWhiteBalanceModes(integerArrayListToArray(whiteBalanceModes));
|
|
|
|
|