diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-29 20:18:22 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-29 20:18:22 +0000 |
commit | 4b3b46e091c7d470e8034a20e05803cbeb2956ba (patch) | |
tree | 1cea7cd3be2e5d50726c0db25de84cf63ee527c9 | |
parent | 417b921f40678db88b86f5c475ec9e2781cfa537 (diff) | |
parent | 59826d2f799afe2ef9570f13ea9db3270566506f (diff) | |
download | cts-android12-tests-release.tar.gz |
Merge "Snap for 11772108 from 49e73bef1e41e6487e0237908b621c7d13348baa to android12-tests-release" into android12-tests-releaseandroid12-tests-release
-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 9bea709abde..0fb76e58a0c 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 @@ 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); |