diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-10-24 00:47:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-10-24 00:47:05 -0700 |
| commit | d71a65adc227a04cf2e95545af7b6ba71f8f1672 (patch) | |
| tree | ae5b90bbb061356e7eb7414dc19102ef6b5cd128 | |
| parent | b4f11b7e5c5dbbf68c39ec20c64bcc9811c08b51 (diff) | |
| parent | a48f631840d0f5560cb4d53129194424594f920c (diff) | |
| download | android_packages_apps_Snap-d71a65adc227a04cf2e95545af7b6ba71f8f1672.tar.gz android_packages_apps_Snap-d71a65adc227a04cf2e95545af7b6ba71f8f1672.tar.bz2 android_packages_apps_Snap-d71a65adc227a04cf2e95545af7b6ba71f8f1672.zip | |
Merge "Camera2: Add setprop control to disable some features."
| -rw-r--r--[-rwxr-xr-x] | src/com/android/camera/PhotoModule.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 747d4abab..cefdeaea6 100755..100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1673,6 +1673,17 @@ public class PhotoModule } else { mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, null); } + + boolean disableQcomMiscSetting = + SystemProperties.getBoolean("camera.qcom.misc.disable", false); + if (disableQcomMiscSetting) { + mUI.overrideSettings(CameraSettings.KEY_ZSL, Parameters.ZSL_OFF); + mUI.overrideSettings(CameraSettings.KEY_FACE_DETECTION, Parameters.FACE_DETECTION_OFF); + mUI.overrideSettings(CameraSettings.KEY_TOUCH_AF_AEC, Parameters.TOUCH_AF_AEC_OFF); + mUI.overrideSettings(CameraSettings.KEY_FOCUS_MODE, Parameters.FOCUS_MODE_AUTO); + mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, Parameters.FLASH_MODE_OFF); + mUI.overrideSettings(CameraSettings.KEY_DENOISE, Parameters.DENOISE_OFF); + } } private void overrideCameraSettings(final String flashMode, |