diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-04-26 20:23:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-26 20:23:12 +0000 |
| commit | 0c49ba971b4c6277bd15dacaaa3921ba9cb76b14 (patch) | |
| tree | 40be74eaf5ec34ea684276b3a93cc1f0c62f9f5b | |
| parent | 7a3bad01b166d5a3c816632452f1160a0ad4bac8 (diff) | |
| parent | c921f161498ba0d9d494faf252fed4caff54a8b8 (diff) | |
| download | cts-android12L-tests-dev.tar.gz | |
Merge "Merge "Camera: Revise hardware level requirement for MPC" into android12-tests-dev am: 49e73bef1e" into android12L-tests-devandroid12L-tests-dev
| -rw-r--r-- | tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java index 0b9e8d1ae71..ea0dd925967 100644 --- a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java @@ -2796,20 +2796,22 @@ public class ExtendedCameraCharacteristicsTest extends Camera2AndroidTestCase { 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); |