commit 97c7fa1b1596a062147f034a2b44781193c052cf
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Aug 19 15:45:13 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 19 02:08:36 2014 +0000
tree 14d2e49123e41b3d5053532fa9278ca32068813a
parent 1b786a35ddd072765348eee2bffa2009c1b14da3
parent 80ef94b5a7daa2d48ca72501e335a648dc67bc1d

Merge "cameraservice: update supportedFocusModes for api1" into lmp-dev

services/camera/libcameraservice/api1/client2/Parameters.cpp

diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp
index b448e06..e7f9a78 100644
--- a/services/camera/libcameraservice/api1/client2/Parameters.cpp
+++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp
@@ -644,8 +644,17 @@
         focusMode = Parameters::FOCUS_MODE_AUTO;
         params.set(CameraParameters::KEY_FOCUS_MODE,
                 CameraParameters::FOCUS_MODE_AUTO);
-        String8 supportedFocusModes(CameraParameters::FOCUS_MODE_INFINITY);
-        bool addComma = true;
+        String8 supportedFocusModes;
+        bool addComma = false;
+        camera_metadata_ro_entry_t focusDistanceCalibration =
+            staticInfo(ANDROID_LENS_INFO_FOCUS_DISTANCE_CALIBRATION, 0, 0, false);
+
+        if (focusDistanceCalibration.count &&
+                focusDistanceCalibration.data.u8[0] !=
+                ANDROID_LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED) {
+            supportedFocusModes += CameraParameters::FOCUS_MODE_INFINITY;
+            addComma = true;
+        }
 
         for (size_t i=0; i < availableAfModes.count; i++) {
             if (addComma) supportedFocusModes += ",";