commit c26b490d5de47f6bc2970e9ba85dc3ef6d914463
author Yin-Chia Yeh <yinchiayeh@google.com> Thu Apr 16 16:40:36 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 16 16:40:36 2015 +0000
tree c47b8456e05605f8435ca63b277e1f5b5d0d8749
parent 23645e6db5ce8ab1e39156224495904af6984021
parent 8a94950bd32ac48c3cd4c7920dbe77ad3c61a28f

Merge "DO NOT MERGE: Camera: disable AE/AWB lock test on legacy devices" into lmp-mr1-dev

tests/tests/hardware/src/android/hardware/camera2/cts/CaptureRequestTest.java

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();