diff options
| author | Camera Software Integration <camswint@localhost> | 2017-05-08 16:29:05 +0530 |
|---|---|---|
| committer | Camera Software Integration <camswint@localhost> | 2017-05-08 16:29:48 +0530 |
| commit | f64339bcc82eb45157fee3b640da793e316d0484 (patch) | |
| tree | 266a0c47a287b065470c8d055bf49c356a7c7113 | |
| parent | 4c861ed100561fe2ebc6c890a891a17ffa3c418d (diff) | |
| download | android_packages_apps_Snap-f64339bcc82eb45157fee3b640da793e316d0484.tar.gz android_packages_apps_Snap-f64339bcc82eb45157fee3b640da793e316d0484.tar.bz2 android_packages_apps_Snap-f64339bcc82eb45157fee3b640da793e316d0484.zip | |
SnapdragonCamera: Temporary compilation fixes
Temporary compilation fixes for the Merge
tag 'camera.lnx.2.0-00010' into camera.lnx.3.0-dev
Change-Id: I539da9948500125a7835dea63cfb2db1c35e1fcd
| -rw-r--r-- | src/com/android/camera/util/PersistUtil.java | 12 | ||||
| -rw-r--r-- | src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java index 4a25c1457..199f31dd6 100644 --- a/src/com/android/camera/util/PersistUtil.java +++ b/src/com/android/camera/util/PersistUtil.java @@ -47,17 +47,17 @@ public class PersistUtil { private static final int PERSIST_CAMERA2_DEBUG = SystemProperties.getInt("persist.sys.camera2.debug", 0); private static final int PERSIST_CAMERA_CANCEL_TOUCHFOCUS_DELAY = - SystemProperties.getInt("persist.camera.focus_delay", 5000); + SystemProperties.getInt("persist.sys.camera.focus_delay", 5000); private static final int PERSIST_CAMERA_DEBUG = - SystemProperties.getInt("persist.camera.debug", 0); + SystemProperties.getInt("persist.sys.camera.debug", 0); private static final String PERSIST_CAMERA_STILLMORE_BRCOLR = - SystemProperties.get("persist.camera.stm_brcolor", "0.5"); + SystemProperties.get("persist.sys.camera.stm_brcolor", "0.5"); private static final String PERSIST_CAMERA_STILLMORE_BRINTENSITY = - SystemProperties.get("persist.camera.stm_brintensity", "0.6"); + SystemProperties.get("persist.sys.camera.stm_brintensity", "0.6"); private static final String PERSIST_CAMERA_STILLMORE_SMOOTHINGINTENSITY = - SystemProperties.get("persist.camera.stm_smooth", "0"); + SystemProperties.get("persist.sys.camera.stm_smooth", "0"); private static final int PERSIST_CAMERA_STILLMORE_NUM_REQUIRED_IMAGE = - SystemProperties.getInt("persist.camera.stm_img_nums", 5); + SystemProperties.getInt("persist.sys.camera.stm_img_nums", 5); public static final int CAMERA2_DEBUG_DUMP_IMAGE = 1; public static final int CAMERA2_DEBUG_DUMP_LOG = 2; diff --git a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java index 91e450f71..d3058f709 100644 --- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java +++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java @@ -95,6 +95,7 @@ public class ClearSightImageProcessor { private static final String PERSIST_DUMP_FRAMES_KEY = "persist.sys.camera.cs.dumpframes"; private static final String PERSIST_DUMP_YUV_KEY = "persist.sys.camera.cs.dumpyuv"; private static final String PERSIST_CS_TIMEOUT_KEY = "persist.sys.camera.cs.timeout"; + private static final String PERSIST_DUMP_DEPTH_KEY = "persist.camera.cs.dumpdepth"; private static final long DEFAULT_TIMESTAMP_THRESHOLD_MS = 10; private static final int DEFAULT_IMAGES_TO_BURST = 4; |