commit 8dc18fe65d3f6327e4fd39eff10d995171842ec5
author Yin-Chia Yeh <yinchiayeh@google.com> Thu Oct 15 17:14:18 2015 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Thu Oct 15 17:14:18 2015 -0700
tree f86a8cd468eca8141f50ac4c5943c2355ac6d3bf
parent b08f69d66e75e14842bdcbdede68bff3bdd908b0

Camera: allow FULLHD_ALT in jpeg sizes

Bug: 24536920

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

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index 6d62067..28693c6 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -178,9 +178,10 @@
 
             if (activeArraySize.getWidth() >= FULLHD.getWidth() &&
                     activeArraySize.getHeight() >= FULLHD.getHeight()) {
-                assertArrayContains(String.format(
+                assertArrayContainsAnyOf(String.format(
                         "Required FULLHD size not found for format %x for: ID %s",
-                        ImageFormat.JPEG, mIds[counter]), jpegSizes, FULLHD);
+                        ImageFormat.JPEG, mIds[counter]), jpegSizes,
+                        new Size[] {FULLHD, FULLHD_ALT});
             }
 
             if (activeArraySize.getWidth() >= HD.getWidth() &&