Use generated classes for req 7.6.1/H-1-1 and H-2-1

Test: m CtsMediaPerformanceClassTestCases
Bug: 332899545
Change-Id: I61a60297ccf1e84f47d4f5e3451f7b17ae398f0b
Merged-In: I61a60297ccf1e84f47d4f5e3451f7b17ae398f0b

2 files changed, 7 insertions, 64 deletions

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 c6765910f7a..0eb0d581113 100644
--- a/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java
+++ b/tests/mediapc/common/src/android/mediapc/cts/common/PerformanceClassEvaluator.java
@@ -1585,7 +1585,7 @@ public class PerformanceClassEvaluator {
         private static final String TAG =
                 LogicalMultiCameraRequirement.class.getSimpleName();
 
-        private LogicalMultiCameraRequirement(String id, RequiredMeasurement<?> ... reqs) {
+        private LogicalMultiCameraRequirement(String id, RequiredMeasurement<?>... reqs) {
             super(id, reqs);
         }
 
@@ -1613,56 +1613,6 @@ public class PerformanceClassEvaluator {
         }
     }
 
-    // used for requirements [7.6.1/H-1-1], [7.6.1/H-2-1]
-    public static class MemoryRequirement extends Requirement {
-        private static final String TAG = MemoryRequirement.class.getSimpleName();
-
-        // Media performance requires 6 GB minimum RAM, but keeping the following to
-        // 5 GB as activityManager.getMemoryInfo() typically returns around 5.4 GB on a 6 GB device,
-        // so these values are a bit lower than the required value stated on the Android CDD.
-        private static final long RS_REQUIRED_MEMORY_MB = Utils.MIN_MEMORY_PERF_CLASS_CANDIDATE_MB;
-        private static final long TUV_REQUIRED_MEMORY_MB = Utils.MIN_MEMORY_PERF_CLASS_T_MB;
-
-        private MemoryRequirement(String id, RequiredMeasurement<?> ... reqs) {
-            super(id, reqs);
-        }
-
-        public void setPhysicalMemory(long physicalMemory) {
-            this.<Long>setMeasuredValue(RequirementConstants.PHYSICAL_MEMORY, physicalMemory);
-        }
-
-        /**
-         * [7.6.1/H-1-1] MUST have at least 6 GB of physical memory.
-         */
-        public static MemoryRequirement createR7_6_1__H_1_1() {
-            RequiredMeasurement<Long> physical_memory = RequiredMeasurement
-                    .<Long>builder()
-                    .setId(RequirementConstants.PHYSICAL_MEMORY)
-                    .setPredicate(RequirementConstants.LONG_GTE)
-                    .addRequiredValue(Build.VERSION_CODES.R, RS_REQUIRED_MEMORY_MB)
-                    .build();
-
-            return new MemoryRequirement(RequirementConstants.R7_6_1__H_1_1, physical_memory);
-        }
-
-        /**
-         * [7.6.1/H-2-1] MUST have at least 6/8 GB of physical memory.
-         */
-        public static MemoryRequirement createR7_6_1__H_2_1() {
-            RequiredMeasurement<Long> physical_memory = RequiredMeasurement
-                    .<Long>builder()
-                    .setId(RequirementConstants.PHYSICAL_MEMORY)
-                    .setPredicate(RequirementConstants.LONG_GTE)
-                    .addRequiredValue(Build.VERSION_CODES.S, RS_REQUIRED_MEMORY_MB)
-                    .addRequiredValue(Build.VERSION_CODES.TIRAMISU, TUV_REQUIRED_MEMORY_MB)
-                    .addRequiredValue(Build.VERSION_CODES.UPSIDE_DOWN_CAKE, TUV_REQUIRED_MEMORY_MB)
-                    .addRequiredValue(Build.VERSION_CODES.VANILLA_ICE_CREAM, TUV_REQUIRED_MEMORY_MB)
-                    .build();
-
-            return new MemoryRequirement(RequirementConstants.R7_6_1__H_2_1, physical_memory);
-        }
-    }
-
     public static class PreviewStabilizationRequirement extends Requirement {
         private static final String TAG =
                 PreviewStabilizationRequirement.class.getSimpleName();
@@ -2514,10 +2464,6 @@ public class PerformanceClassEvaluator {
         return this.<DensityRequirement>addRequirement(DensityRequirement.createR7_1_1_3__H_1_1());
     }
 
-    public MemoryRequirement addR7_6_1__H_1_1() {
-        return this.<MemoryRequirement>addRequirement(MemoryRequirement.createR7_6_1__H_1_1());
-    }
-
     public ResolutionRequirement addR7_1_1_1__H_2_1() {
         return this.<ResolutionRequirement>addRequirement(
             ResolutionRequirement.createR7_1_1_1__H_2_1());
@@ -2527,11 +2473,6 @@ public class PerformanceClassEvaluator {
         return this.<DensityRequirement>addRequirement(DensityRequirement.createR7_1_1_3__H_2_1());
     }
 
-    public MemoryRequirement addR7_6_1__H_2_1() {
-        return this.<MemoryRequirement>addRequirement(MemoryRequirement.createR7_6_1__H_2_1());
-    }
-
-
     public FileSystemRequirement addR8_2__H_1_1() {
         return this.addRequirement(FileSystemRequirement.createR8_2__H_1_1());
     }
diff --git a/tests/mediapc/src/android/mediapc/cts/PerformanceClassTest.java b/tests/mediapc/src/android/mediapc/cts/PerformanceClassTest.java
index 3cc6f531810..401278d4b15 100644
--- a/tests/mediapc/src/android/mediapc/cts/PerformanceClassTest.java
+++ b/tests/mediapc/src/android/mediapc/cts/PerformanceClassTest.java
@@ -29,7 +29,9 @@ import android.media.MediaFormat;
 import android.media.UnsupportedSchemeException;
 import android.mediapc.cts.common.PerformanceClassEvaluator;
 import android.mediapc.cts.common.Requirements;
+import android.mediapc.cts.common.Requirements.Android11MemoryRequirement;
 import android.mediapc.cts.common.Requirements.HDRDisplayRequirement;
+import android.mediapc.cts.common.Requirements.MemoryRequirement;
 import android.mediapc.cts.common.Utils;
 import android.util.Log;
 
@@ -199,11 +201,11 @@ public class PerformanceClassTest {
         Log.i(TAG, String.format("Total device memory = %,d MB", totalMemoryMb));
 
         PerformanceClassEvaluator pce = new PerformanceClassEvaluator(this.mTestName);
-        PerformanceClassEvaluator.MemoryRequirement r7_6_1_h_1_1 = pce.addR7_6_1__H_1_1();
-        PerformanceClassEvaluator.MemoryRequirement r7_6_1_h_2_1 = pce.addR7_6_1__H_2_1();
+        Android11MemoryRequirement r7_6_1_h_1_1 = Requirements.addR7_6_1__H_1_1(pce);
+        MemoryRequirement r7_6_1_h_2_1 = Requirements.addR7_6_1__H_2_1(pce);
 
-        r7_6_1_h_1_1.setPhysicalMemory(totalMemoryMb);
-        r7_6_1_h_2_1.setPhysicalMemory(totalMemoryMb);
+        r7_6_1_h_1_1.setPhysicalMemoryMb(totalMemoryMb);
+        r7_6_1_h_2_1.setPhysicalMemoryMb(totalMemoryMb);
 
         pce.submitAndCheck();
     }