commit 4faeeea5a4fc1215a8abef4e5023e4934c10a6c2
author Daniel Xie <dxie@google.com> Fri Oct 23 23:11:49 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 23 23:11:49 2015 +0000
tree 4f6d8c87f32fb08249734135df5a6957f14a852e
parent b757eb50b9030192b326865678f2df6f2519af67
parent 066ff634e07cd87d5c2bbb18a7d10e5eff10ec97

Merge "Camera: allow FULLHD_ALT in jpeg sizes" into marshmallow-cts-dev am: 1f8716504d
am: 066ff634e0

* commit '066ff634e07cd87d5c2bbb18a7d10e5eff10ec97':
  Camera: allow FULLHD_ALT in jpeg sizes

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