summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2012-10-08 16:22:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-08 16:22:39 -0700
commitcf6eb207f21a3cbf4da91273c16c5dab04b2d824 (patch)
treec7b6b45c48820fbb59c0d30a6d9a46c76298ba5e /services/camera
parent390bb827d50a1ba0d7df8e9f15eaebcb56e99b3c (diff)
parent4a4253b979586c9de21425f5e3cb34da9f1e57de (diff)
downloadframeworks_av-cf6eb207f21a3cbf4da91273c16c5dab04b2d824.zip
frameworks_av-cf6eb207f21a3cbf4da91273c16c5dab04b2d824.tar.gz
frameworks_av-cf6eb207f21a3cbf4da91273c16c5dab04b2d824.tar.bz2
am 4a4253b9: am 82edd543: Camera2: isSmoothZoomSupported should return FALSE
* commit '4a4253b979586c9de21425f5e3cb34da9f1e57de': Camera2: isSmoothZoomSupported should return FALSE
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/camera2/Parameters.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 1c8585a..a2ec277 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -729,7 +729,7 @@ status_t Parameters::initialize(const CameraMetadata *info) {
params.set(CameraParameters::KEY_ZOOM_SUPPORTED,
CameraParameters::TRUE);
params.set(CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED,
- CameraParameters::TRUE);
+ CameraParameters::FALSE);
params.set(CameraParameters::KEY_FOCUS_DISTANCES,
"Infinity,Infinity,Infinity");