Merge "Camera: Update MULTI_CAMERA requirement in MPC" into android13-tests-dev am: 6c732b0d23 am: 9eb0c88448

Original change: https://android-review.googlesource.com/c/platform/cts/+/2853005

Change-Id: Ibe945c80a7667b2e0e225180a92d141f674c2ad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 6 insertions, 20 deletions

diff --git a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index 59f19dd27bf..fa0aa724676 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -3085,14 +3085,12 @@ public class ExtendedCameraCharacteristicsTest extends Camera2AndroidTestCase {
             }
 
             // H-1-13
-            int facing = staticInfo.getLensFacingChecked();
-            int numOfPhysicalRgbCameras = getNumberOfRgbPhysicalCameras(facing);
-            boolean logicalMultiCameraReqMet =
-                    (numOfPhysicalRgbCameras <= 1) || staticInfo.isLogicalMultiCamera();
             if (isPrimaryRear) {
+                int facing = staticInfo.getLensFacingChecked();
+                int numOfPhysicalRgbCameras = getNumberOfRgbPhysicalCameras(facing);
+                boolean logicalMultiCameraReqMet =
+                        (numOfPhysicalRgbCameras <= 1) || staticInfo.isLogicalMultiCamera();
                 logicalMultiCameraReq.setRearLogicalMultiCameraReqMet(logicalMultiCameraReqMet);
-            } else {
-                logicalMultiCameraReq.setFrontLogicalMultiCameraReqMet(logicalMultiCameraReqMet);
             }
 
             // H-1-14
@@ -3129,7 +3127,6 @@ public class ExtendedCameraCharacteristicsTest extends Camera2AndroidTestCase {
                     CameraMetadata.SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN);
             ultrawideZoomRatioReq.setFrontUltraWideZoomRatioReqMet(false);
             previewStabilizationReq.setFrontPreviewStabilizationSupported(false);
-            logicalMultiCameraReq.setFrontLogicalMultiCameraReqMet(false);
             streamUseCaseReq.setFrontStreamUseCaseSupported(false);
         }
 
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 1e803c20bde..698592bdfb2 100644
--- a/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java
+++ b/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java
@@ -1431,14 +1431,9 @@ public class PerformanceClassEvaluator {
                     reqMet);
         }
 
-        public void setFrontLogicalMultiCameraReqMet(boolean reqMet) {
-            this.setMeasuredValue(RequirementConstants.FRONT_CAMERA_LOGICAL_MULTI_CAMERA_REQ_MET,
-                    reqMet);
-        }
-
         /**
          * [2.2.7.2/7.5/H-1-13] MUST support LOGICAL_MULTI_CAMERA capability for the primary
-         * cameras if there are greater than 1 RGB cameras facing the same direction.
+         * rear-facing camera if there are greater than 1 RGB rear-facing cameras.
          */
         public static LogicalMultiCameraRequirement createLogicalMultiCameraReq() {
             RequiredMeasurement<Boolean> rearRequirement = RequiredMeasurement
@@ -1447,15 +1442,9 @@ public class PerformanceClassEvaluator {
                 .setPredicate(RequirementConstants.BOOLEAN_EQ)
                 .addRequiredValue(Build.VERSION_CODES.TIRAMISU, true)
                 .build();
-            RequiredMeasurement<Boolean> frontRequirement = RequiredMeasurement
-                .<Boolean>builder()
-                .setId(RequirementConstants.FRONT_CAMERA_LOGICAL_MULTI_CAMERA_REQ_MET)
-                .setPredicate(RequirementConstants.BOOLEAN_EQ)
-                .addRequiredValue(Build.VERSION_CODES.TIRAMISU, true)
-                .build();
 
             return new LogicalMultiCameraRequirement(RequirementConstants.R7_5__H_1_13,
-                    rearRequirement, frontRequirement);
+                    rearRequirement);
         }
     }