am c26b490d: Merge "DO NOT MERGE: Camera: disable AE/AWB lock test on legacy devices" into lmp-mr1-dev
* commit 'c26b490d5de47f6bc2970e9ba85dc3ef6d914463':
DO NOT MERGE: Camera: disable AE/AWB lock test on legacy devices
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 1f2792c..d5bd4b5 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java
@@ -282,6 +282,11 @@
try {
openDevice(mCameraIds[i]);
+ if (mStaticInfo.isHardwareLevelLegacy()) {
+ Log.i(TAG, "Skipping test on legacy devices");
+ continue;
+ }
+
Size maxPreviewSz = mOrderedPreviewSizes.get(0); // Max preview size.
// Update preview surface with given size for all sub-tests.
@@ -461,6 +466,11 @@
try {
openDevice(id);
+ if (mStaticInfo.isHardwareLevelLegacy()) {
+ Log.i(TAG, "Skipping test on legacy devices");
+ continue;
+ }
+
awbModeAndLockTestByCamera();
} finally {
closeDevice();