diff options
Diffstat (limited to 'tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java')
-rw-r--r-- | tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java index f1886859d67..fc8c4db5164 100644 --- a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java +++ b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java @@ -229,13 +229,6 @@ public class StaticMetadata { * at least the desired one (but could be higher) */ public boolean isHardwareLevelAtLeast(int level) { - int deviceLevel = getHardwareLevelChecked(); - - return hardwareLevelPredicate(deviceLevel, level); - } - - // Return true if level1 is at least level2 - public static boolean hardwareLevelPredicate(int level1, int level2) { final int[] sortedHwLevels = { CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY, CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL, @@ -243,19 +236,19 @@ public class StaticMetadata { CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL, CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_3 }; - - if (level1 == level2) { + int deviceLevel = getHardwareLevelChecked(); + if (level == deviceLevel) { return true; } for (int sortedlevel : sortedHwLevels) { - if (sortedlevel == level2) { + if (sortedlevel == level) { return true; - } else if (sortedlevel == level1) { + } else if (sortedlevel == deviceLevel) { return false; } } - Assert.fail("Unknown hardwareLevel " + level1 + " and device hardware level " + level2); + Assert.fail("Unknown hardwareLevel " + level + " and device hardware level " + deviceLevel); return false; } |