commit c324b9ed845556fc6f412fe5235c66c7b1e6af56
author Yin-Chia Yeh <yinchiayeh@google.com> Fri Sep 19 01:25:34 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 19 01:25:34 2014 +0000
tree 244a4be27487f69dd683d4f7349790a41ddd428b
parent 4fb6ea5f056cddadef65cf70feb1651d30c7c327
parent 84cbfd32ada2c9a49ecc9377b571d9cc594bee6d

Merge "Camera2: Fix OPT level logic" into lmp-dev

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

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index 2ddff9f..a28eadd 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -65,7 +65,7 @@
     private static final int LEGACY = CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY;
     private static final int LIMITED = CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;
     private static final int FULL = CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL;
-    private static final int OPT = -1;  // For keys that are optional on all hardware levels.
+    private static final int OPT = Integer.MAX_VALUE;  // For keys that are optional on all hardware levels.
 
     /*
      * Capabilities short hand
@@ -478,7 +478,7 @@
     private static int remapHardwareLevel(int level) {
         switch (level) {
             case OPT:
-                return -1;
+                return Integer.MAX_VALUE;
             case LEGACY:
                 return 0; // lowest
             case LIMITED: