diff options
| author | huibang.xa.liu <huibang.xa.liu@sonymobile.com> | 2019-11-08 10:48:34 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-08 10:48:34 -0800 |
| commit | e59bb7756a82dbe7bfa3c6b6da3695b2f79f7673 (patch) | |
| tree | d780eb73a821b9873165ad9cc03c014a2cd6f5b9 | |
| parent | fc5194c90626ae0abd74bf6a125ffacfd2f0ff49 (diff) | |
| parent | c4ff118fa0b08429b017e878649573b4ab5db75f (diff) | |
| download | cts-e59bb7756a82dbe7bfa3c6b6da3695b2f79f7673.tar.gz | |
Merge "Camera CTS: Fix cts testFlashTurnOff failed" am: 1f2a2f92bd
am: c4ff118fa0
Change-Id: I88de41ef42d4019b5e4fd11f3b45acf197f17a24
| -rw-r--r-- | tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java b/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java index 9342a6fc574..53decc11b02 100644 --- a/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java @@ -517,7 +517,11 @@ public class CaptureRequestTest extends Camera2SurfaceViewTestCase { " does not support color outputs, skipping"); continue; } - + if (!mAllStaticInfo.get(mCameraIds[i]).hasFlash()) { + Log.i(TAG, "Camera " + mCameraIds[i] + + " does not support flash, skipping"); + continue; + } openDevice(mCameraIds[i]); SimpleCaptureCallback listener = new SimpleCaptureCallback(); CaptureRequest.Builder requestBuilder = @@ -1462,18 +1466,6 @@ public class CaptureRequestTest extends Camera2SurfaceViewTestCase { mSession.setRepeatingRequest(requestBuilder.build(), listener, mHandler); waitForSettingsApplied(listener, NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY); - // For camera that doesn't have flash unit, flash state should always be UNAVAILABLE. - if (mStaticInfo.getFlashInfoChecked() == false) { - for (int i = 0; i < NUM_FLASH_REQUESTS_TESTED; i++) { - result = listener.getCaptureResult(CAPTURE_RESULT_TIMEOUT_MS); - mCollector.expectEquals("No flash unit available, flash state must be UNAVAILABLE" - + "for AE mode " + initialAeControl, - CaptureResult.FLASH_STATE_UNAVAILABLE, - result.get(CaptureResult.FLASH_STATE)); - } - return; - } - // Turn on torch using FLASH_MODE_TORCH requestBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON); requestBuilder.set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH); |