commit a9551a9abf452604ee905fd3c2f4f2d6be2e3fd5
author Shuzhen Wang <shuzhenwang@google.com> Thu Mar 07 14:38:08 2019 -0800
committer Shuzhen Wang <shuzhenwang@google.com> Fri Mar 08 16:41:46 2019 +0000
tree 754898d601db2248d07eca8c3b5744267a352fe9
parent 0f3df1b53bdc449c172b5d6967a410671c5bea84

Camera: Skip physical non-color cameras for logical camera testing

Test: LogicalCameraDeviceTest passes on partner device
Bug: 127835920
Change-Id: I51fbb8a5b39cd20602c9dbd36e5afdc0d245adf5

tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java b/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
index 33365b2..411747d 100644
--- a/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
@@ -528,6 +528,10 @@
             CameraCharacteristics properties =
                     mCameraManager.getCameraCharacteristics(physicalCameraId);
             assertNotNull("Can't get camera characteristics!", properties);
+            if (!mAllStaticInfo.get(physicalCameraId).isColorOutputSupported()) {
+                // No color output support, skip.
+                continue;
+            }
             StreamConfigurationMap configMap =
                 properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
             physicalConfigs.put(physicalCameraId, configMap);
@@ -565,7 +569,7 @@
             ArrayList<String> supportedPhysicalCameras = new ArrayList<String>();
             for (String physicalCameraId : physicalCameraIds) {
                 List<Size> physicalPreviewSizes = physicalPreviewSizesMap.get(physicalCameraId);
-                if (physicalPreviewSizes.contains(previewSize)) {
+                if (physicalPreviewSizes != null && physicalPreviewSizes.contains(previewSize)) {
                    long minDurationPhysical =
                            physicalConfigs.get(physicalCameraId).getOutputMinFrameDuration(
                            ImageFormat.YUV_420_888, previewSize);