Merge "Camera2: don't need check per frame control for digital zoom test" into lmp-dev
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
index 6856438..fd4f338 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
@@ -510,10 +510,6 @@
for (String id : mCameraIds) {
try {
openDevice(id);
- if (!mStaticInfo.isPerFrameControlSupported()) {
- Log.i(TAG, "Camera " + id + "Doesn't support per frame control");
- continue;
- }
digitalZoomPreviewCombinationTestByCamera();
} finally {
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
index 92fbb7f..eaaad59 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
@@ -55,7 +55,7 @@
public class RecordingTest extends Camera2SurfaceViewTestCase {
private static final String TAG = "RecordingTest";
private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
- private static final boolean DEBUG_DUMP = false;
+ private static final boolean DEBUG_DUMP = Log.isLoggable(TAG, Log.DEBUG);
private static final int RECORDING_DURATION_MS = 2000;
private static final int DURATION_MARGIN_MS = 400;
private static final int FRAME_DURATION_ERROR_TOLERANCE_MS = 3;