Merge "CTS fixbuild: Don't use hidden packages in tests." into lmp-mr1-dev
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraTestUtils.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraTestUtils.java
index 47d0bc3..c69d982 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraTestUtils.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraTestUtils.java
@@ -700,6 +700,21 @@
}
/**
+ * Returns true if the given {@code array} contains the given element.
+ *
+ * @param array {@code array} to check for {@code elem}
+ * @param elem {@code elem} to test for
+ * @return {@code true} if the given element is contained
+ */
+ public static boolean contains(int[] array, int elem) {
+ if (array == null) return false;
+ for (int i = 0; i < array.length; i++) {
+ if (elem == array[i]) return true;
+ }
+ return false;
+ }
+
+ /**
* Get object array from byte array.
*
* @param array Input byte array to be converted
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
index ebfe3d7..3f03f46 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
@@ -32,7 +32,6 @@
import android.hardware.camera2.cts.helpers.StaticMetadata;
import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
import android.hardware.camera2.params.StreamConfigurationMap;
-import android.hardware.camera2.utils.ArrayUtils;
import android.media.Image;
import android.media.ImageReader;
import android.os.ConditionVariable;
@@ -232,7 +231,7 @@
int[] supportedFormats = config.getOutputFormats();
List<Integer> supportedYUVFormats = new ArrayList<>();
for (int format : YUVFormats) {
- if (ArrayUtils.contains(supportedFormats, format)) {
+ if (CameraTestUtils.contains(supportedFormats, format)) {
supportedYUVFormats.add(format);
}
}
@@ -364,9 +363,10 @@
Bitmap.Config.ARGB_8888);
dumpFile(fullSizeYuvFileName, fullYUVBmap);
}
- fail("YUV and JPEG image at capture size " + captureSz +
- " for the same frame are not similar, center patches " +
- "have difference metric of " + difference);
+ fail("Camera " + mCamera.getId() + ": YUV and JPEG image at " +
+ "capture size " + captureSz + " for the same frame are " +
+ "not similar, center patches have difference metric of " +
+ difference);
}
// Stop capture, delete the streams.
