commit 61fdd1423c67abef80c0c353cc957d86cbf26041
author Shuzhen Wang <shuzhenwang@google.com> Fri Apr 30 17:39:10 2021 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Wed May 12 16:18:33 2021 -0700
tree 6a34902f275acd51623d74e772a082c1725ca799
parent fd9eaf78e90cb531ee113140ee3e8443de10f9b1

Camera: Add performance class test for camera2 extension

Require HDR and NIGHT camera2 extensions for performance class

Test: testCameraSPerfClassCharacteristics
Bug: 186046918
Change-Id: I1bc49b3d85503ec044646aaa2d108ffaf9d40558

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

diff --git a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index a6b6bd1..f7953b0 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -25,6 +25,7 @@
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraCharacteristics.Key;
 import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraExtensionCharacteristics;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CameraMetadata;
 import android.hardware.camera2.CaptureRequest;
@@ -2645,6 +2646,17 @@
                         jpegSize.getWidth() >= FULLHD.getWidth() &&
                         jpegSize.getHeight() >= FULLHD.getHeight());
             }
+
+            // H-1-9
+            CameraExtensionCharacteristics extensionChars =
+                    mCameraManager.getCameraExtensionCharacteristics(cameraId);
+            List<Integer> supportedExtensions = extensionChars.getSupportedExtensions();
+            mCollector.expectTrue(
+                    "Primary rear/front camera must support the HDR camera2 extension",
+                    supportedExtensions.contains(CameraExtensionCharacteristics.EXTENSION_HDR));
+            mCollector.expectTrue(
+                    "Primary rear/front camera must support the NIGHT camera2 extension",
+                    supportedExtensions.contains(CameraExtensionCharacteristics.EXTENSION_NIGHT));
         }
         mCollector.expectTrue("There must be a primary rear camera for S performance class.",
                 hasPrimaryRear);