commit df5bf940a29fa7aa5965d09c7ce8ec278da69adb
author Chris Rosenberger <corosenberger@google.com> Tue Jun 27 18:28:37 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Thu Jun 29 22:20:02 2023 +0000
tree a6adabab437c44bf239dfeb493f04d1eca557fc9
parent 848132e24bbe21f567787e9745a5daa90c694cf0

Fixing required measurement thresholds for PerformanceClassEvaluator

Test: atest CtsMediaPerformanceClassTestCases
Bug: 288337460
(cherry picked from https://android-review.googlesource.com/q/commit:4af849f6eb5d75b274cbae4cd5a6db8d3c4bb9b0)
Merged-In: I8621cf3ff08673510f847670a2c258206dcd809d
Change-Id: I8621cf3ff08673510f847670a2c258206dcd809d

tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java

diff --git a/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java b/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java
index ea64873..a283ec3 100644
--- a/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java
+++ b/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java
@@ -247,8 +247,8 @@
 
         /**
          * [2.2.7.2/7.5/H-1-6] MUST have camera2 startup latency (open camera to first
-         * preview frame) < 600ms as measured by the CTS camera PerformanceTest under ITS lighting
-         * conditions (3000K) for both primary cameras.
+         * preview frame) < 600ms (S and below) or 500ms (T and above) as measured by the CTS camera
+         * PerformanceTest under ITS lighting conditions (3000K) for both primary cameras.
          */
         public static CameraLatencyRequirement createLaunchLatencyReq() {
             RequiredMeasurement<Float> rearLaunchLatency = RequiredMeasurement
@@ -257,8 +257,8 @@
                     .setPredicate(RequirementConstants.FLOAT_LTE)
                     .addRequiredValue(Build.VERSION_CODES.R, 600.0f)
                     .addRequiredValue(Build.VERSION_CODES.S, 600.0f)
-                    .addRequiredValue(Build.VERSION_CODES.TIRAMISU, 600.0f)
-                    .addRequiredValue(Build.VERSION_CODES.UPSIDE_DOWN_CAKE, 600.0f)
+                    .addRequiredValue(Build.VERSION_CODES.TIRAMISU, 500.0f)
+                    .addRequiredValue(Build.VERSION_CODES.UPSIDE_DOWN_CAKE, 500.0f)
                     .build();
             RequiredMeasurement<Float> frontLaunchLatency = RequiredMeasurement
                     .<Float>builder()
@@ -266,8 +266,8 @@
                     .setPredicate(RequirementConstants.FLOAT_LTE)
                     .addRequiredValue(Build.VERSION_CODES.R, 600.0f)
                     .addRequiredValue(Build.VERSION_CODES.S, 600.0f)
-                    .addRequiredValue(Build.VERSION_CODES.TIRAMISU, 600.0f)
-                    .addRequiredValue(Build.VERSION_CODES.UPSIDE_DOWN_CAKE, 600.0f)
+                    .addRequiredValue(Build.VERSION_CODES.TIRAMISU, 500.0f)
+                    .addRequiredValue(Build.VERSION_CODES.UPSIDE_DOWN_CAKE, 500.0f)
                     .build();
 
             return new CameraLatencyRequirement(RequirementConstants.R7_5__H_1_6,