diff options
-rw-r--r--[-rwxr-xr-x] | src/com/android/camera/MediaSaveService.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 14 | ||||
-rw-r--r-- | src/com/android/camera/imageprocessor/ZSLQueue.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/util/PersistUtil.java | 14 | ||||
-rw-r--r--[-rwxr-xr-x] | src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java | 10 | ||||
-rw-r--r-- | src_wrapper/org/codeaurora/snapcam/wrapper/Wrapper.java | 2 |
6 files changed, 22 insertions, 22 deletions
diff --git a/src/com/android/camera/MediaSaveService.java b/src/com/android/camera/MediaSaveService.java index 2d7247d83..973aed415 100755..100644 --- a/src/com/android/camera/MediaSaveService.java +++ b/src/com/android/camera/MediaSaveService.java @@ -45,7 +45,7 @@ public class MediaSaveService extends Service { // The memory limit for unsaved image is 50MB. private static final int SAVE_TASK_MEMORY_LIMIT_IN_MB = - android.os.SystemProperties.getInt("persist.camera.perf.memlimit", 60); + android.os.SystemProperties.getInt("persist.sys.camera.perf.memlimit", 60); private static final int SAVE_TASK_MEMORY_LIMIT = SAVE_TASK_MEMORY_LIMIT_IN_MB * 1024 * 1024; private static final String TAG = "CAM_" + MediaSaveService.class.getSimpleName(); diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 6a5ba958f..550d9f262 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -221,12 +221,12 @@ public class PhotoModule private boolean mFaceDetectionStarted = false; - private static final String PERSIST_LONG_SAVE = "persist.camera.longshot.save"; - private static final String PERSIST_PREVIEW_RESTART = "persist.camera.feature.restart"; - private static final String PERSIST_CAPTURE_ANIMATION = "persist.camera.capture.animate"; + private static final String PERSIST_LONG_SAVE = "persist.sys.camera.longshot.save"; + private static final String PERSIST_PREVIEW_RESTART = "persist.sys.camera.feature.restart"; + private static final String PERSIST_CAPTURE_ANIMATION = "persist.sys.camera.capture.animate"; private static final boolean PERSIST_SKIP_MEM_CHECK = - android.os.SystemProperties.getBoolean("persist.camera.perf.skip_memck", false); - private static final String PERSIST_ZZHDR_ENABLE="persist.camera.zzhdr.enable"; + android.os.SystemProperties.getBoolean("persist.sys.camera.perf.skip_memck", false); + private static final String PERSIST_ZZHDR_ENABLE="persist.sys.camera.zzhdr.enable"; private static final int MINIMUM_BRIGHTNESS = 0; private static final int MAXIMUM_BRIGHTNESS = 6; @@ -1787,7 +1787,7 @@ public class PhotoModule if (mCameraState == LONGSHOT) { mLongShotCaptureCountLimit = SystemProperties.getInt( - "persist.camera.longshot.shotnum", 0); + "persist.sys.camera.longshot.shotnum", 0); mLongShotCaptureCount = 1; if(mLongshotSave) { mCameraDevice.takePicture(mHandler, @@ -3970,7 +3970,7 @@ public class PhotoModule //value: 2 - 720x480 //value: 3 - 1280x720 //value: 4 - 1920x1080 - int preview_resolution = SystemProperties.getInt("persist.camera.preview.size", 0); + int preview_resolution = SystemProperties.getInt("persist.sys.camera.preview.size", 0); switch (preview_resolution) { case 1: { optimalSize.width = 640; diff --git a/src/com/android/camera/imageprocessor/ZSLQueue.java b/src/com/android/camera/imageprocessor/ZSLQueue.java index c9ecb79a2..4bfb1e3bc 100644 --- a/src/com/android/camera/imageprocessor/ZSLQueue.java +++ b/src/com/android/camera/imageprocessor/ZSLQueue.java @@ -42,7 +42,7 @@ import java.util.LinkedList; import java.util.NoSuchElementException; public class ZSLQueue { - private static final String CIRCULAR_BUFFER_SIZE_PERSIST = "persist.camera.zsl.buffer.size"; + private static final String CIRCULAR_BUFFER_SIZE_PERSIST = "persist.sys.camera.zsl.buffer.size"; private static final int CIRCULAR_BUFFER_SIZE_DEFAULT = 5; private int mCircularBufferSize = CIRCULAR_BUFFER_SIZE_DEFAULT; private ImageItem[] mBuffer; diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java index 37bf6ce11..d0b936bbc 100644 --- a/src/com/android/camera/util/PersistUtil.java +++ b/src/com/android/camera/util/PersistUtil.java @@ -33,19 +33,19 @@ import android.os.SystemProperties; public class PersistUtil { private static final int PERSIST_MEMORY_LIMIT = - SystemProperties.getInt("persist.camera.perf.memlimit", 60); + SystemProperties.getInt("persist.sys.camera.perf.memlimit", 60); private static final boolean PERSIST_SKIP_MEMORY_CHECK = - SystemProperties.getBoolean("persist.camera.perf.skip_memck", false); + SystemProperties.getBoolean("persist.sys.camera.perf.skip_memck", false); private static final int PERSIST_LONGSHOT_SHOT_LIMIT = - SystemProperties.getInt("persist.camera.longshot.shotnum", 50); + SystemProperties.getInt("persist.sys.camera.longshot.shotnum", 50); private static final int PERSIST_CAMERA_PREVIEW_SIZE = - SystemProperties.getInt("persist.camera.preview.size", 0); + SystemProperties.getInt("persist.sys.camera.preview.size", 0); private static final boolean PERSIST_CAMERA_CAMERA2 = - SystemProperties.getBoolean("persist.camera.camera2", false); + SystemProperties.getBoolean("persist.sys.camera.camera2", false); private static final boolean PERSIST_CAMERA_ZSL = - SystemProperties.getBoolean("persist.camera.zsl.disabled", false); + SystemProperties.getBoolean("persist.sys.camera.zsl.disabled", false); private static final int PERSIST_CAMERA2_DEBUG = - SystemProperties.getInt("persist.camera2.debug", 0); + SystemProperties.getInt("persist.sys.camera2.debug", 0); 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 bfd58db28..b347586d7 100755..100644 --- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java +++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java @@ -82,11 +82,11 @@ import com.android.camera.util.CameraUtil; public class ClearSightImageProcessor { private static final String TAG = "ClearSightImageProcessor"; - private static final String PERSIST_TIMESTAMP_LIMIT_KEY = "persist.camera.cs.threshold"; - private static final String PERSIST_BURST_COUNT_KEY = "persist.camera.cs.burstcount"; - private static final String PERSIST_DUMP_FRAMES_KEY = "persist.camera.cs.dumpframes"; - private static final String PERSIST_DUMP_YUV_KEY = "persist.camera.cs.dumpyuv"; - private static final String PERSIST_CS_TIMEOUT_KEY = "persist.camera.cs.timeout"; + private static final String PERSIST_TIMESTAMP_LIMIT_KEY = "persist.sys.camera.cs.threshold"; + private static final String PERSIST_BURST_COUNT_KEY = "persist.sys.camera.cs.burstcount"; + 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 long DEFAULT_TIMESTAMP_THRESHOLD_MS = 10; private static final int DEFAULT_IMAGES_TO_BURST = 4; diff --git a/src_wrapper/org/codeaurora/snapcam/wrapper/Wrapper.java b/src_wrapper/org/codeaurora/snapcam/wrapper/Wrapper.java index 541d4cc77..f20bcf576 100644 --- a/src_wrapper/org/codeaurora/snapcam/wrapper/Wrapper.java +++ b/src_wrapper/org/codeaurora/snapcam/wrapper/Wrapper.java @@ -39,7 +39,7 @@ import android.util.Log; public class Wrapper{ protected final static boolean DEBUG = - SystemProperties.getBoolean("persist.camera.wrapper.debug", false); + SystemProperties.getBoolean("persist.sys.camera.wrapper.debug", false); protected final static String TAG = "Wrapper"; protected static int getFieldValue(Field field, int def){ |