Camera2: More thorough compatibility fixes

Certain chipsets (such as omap) have contrast, sharpness and saturation
set, but no max integer given for those

Change-Id: I58efaef4d0a511aefc803a440e0c3aa3dbdc9483

1 files changed, 6 insertions, 3 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 9f98efffa..f077e7011 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -806,15 +806,18 @@ public class CameraSettings {
                     selectableZoneAf, ParametersWrapper.getSupportedSelectableZoneAf(mParameters));
         }
 
-        if (saturation != null && !CameraUtil.isSupported(mParameters, "saturation")) {
+        if (saturation != null && !CameraUtil.isSupported(mParameters, "saturation") &&
+                !CameraUtil.isSupported(mParameters, "saturation-max")) {
             removePreference(group, saturation.getKey());
         }
 
-        if (contrast != null && !CameraUtil.isSupported(mParameters, "contrast")) {
+        if (contrast != null && !CameraUtil.isSupported(mParameters, "contrast") &&
+                !CameraUtil.isSupported(mParameters, "contrast-max")) {
             removePreference(group, contrast.getKey());
         }
 
-        if (sharpness != null && !CameraUtil.isSupported(mParameters, "sharpness")) {
+        if (sharpness != null && !CameraUtil.isSupported(mParameters, "sharpness") &&
+                !CameraUtil.isSupported(mParameters, "sharpness-max")) {
             removePreference(group, sharpness.getKey());
         }