commit 2db226b1468bcc79c92df2f046911f23181b86f8
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 28 17:15:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 28 17:15:15 2019 +0000
tree b4046915b2472ab0d0d49c6c6632f4303c6aca4b
parent 39130aaa23ad4d22b5519d55d7d35cf5cd9f4e49
parent 07577570ed3e903b68f810c28a101d68823bfe05

Merge "Camera: Fix incorrect hardware level comparisions in CTS" into pie-cts-dev

tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index 78f7523..9339535 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -250,7 +250,8 @@
 
             // Handle FullHD special case first
             if (jpegSizesList.contains(FULLHD)) {
-                if (hwLevel >= LEVEL_3 || hwLevel == FULL || (hwLevel == LIMITED &&
+                if (compareHardwareLevel(hwLevel, LEVEL_3) >= 0 || hwLevel == FULL ||
+                        (hwLevel == LIMITED &&
                         maxVideoSize.getWidth() >= FULLHD.getWidth() &&
                         maxVideoSize.getHeight() >= FULLHD.getHeight())) {
                     boolean yuvSupportFullHD = yuvSizesList.contains(FULLHD) ||
@@ -278,7 +279,8 @@
                 jpegSizesList.removeAll(toBeRemoved);
             }
 
-            if (hwLevel >= LEVEL_3 || hwLevel == FULL || hwLevel == LIMITED) {
+            if (compareHardwareLevel(hwLevel, LEVEL_3) >= 0 || hwLevel == FULL ||
+                    hwLevel == LIMITED) {
                 if (!yuvSizesList.containsAll(jpegSizesList)) {
                     for (Size s : jpegSizesList) {
                         if (!yuvSizesList.contains(s)) {