Merge "Camera: Revise hardware level requirement for MPC" into android12-tests-dev
diff --git a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index 9bea709..0fb76e5 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -2708,20 +2708,22 @@
String facingString = isPrimaryRear ? "rear" : "front";
// H-1-3
- if (assertSPerfClass || (assertRPerfClass && isPrimaryRear)) {
- mCollector.expectTrue("Primary " + facingString +
- " camera should be at least FULL, but is " +
- toStringHardwareLevel(staticInfo.getHardwareLevelChecked()),
- staticInfo.isHardwareLevelAtLeastFull());
- } else if (assertRPerfClass) {
- mCollector.expectTrue("Primary " + facingString +
- " camera should be at least LIMITED, but is " +
- toStringHardwareLevel(staticInfo.getHardwareLevelChecked()),
- staticInfo.isHardwareLevelAtLeastLimited());
+ if (assertPerfClass) {
+ if (isPrimaryRear) {
+ mCollector.expectTrue("Primary " + facingString +
+ " camera should be at least FULL, but is " +
+ toStringHardwareLevel(staticInfo.getHardwareLevelChecked()),
+ staticInfo.isHardwareLevelAtLeastFull());
+ } else {
+ mCollector.expectTrue("Primary " + facingString +
+ " camera should be at least LIMITED, but is " +
+ toStringHardwareLevel(staticInfo.getHardwareLevelChecked()),
+ staticInfo.isHardwareLevelAtLeastLimited());
+ }
}
-
reportLog.addValue(facingString + " camera hardware level",
staticInfo.getHardwareLevelChecked(), ResultType.NEUTRAL, ResultUnit.NONE);
+
if (isPrimaryRear) {
perfClassLevelH13 = updatePerfClassLevel(staticInfo.isHardwareLevelAtLeastFull(),
perfClassLevelH13);
