SnapdragonCamera: Rename property name

As app can't read property "persist.sys.camera.xxxx" with permission denied on
Android O, so rename "persist.sys.camera.xxx" to "persist.vendor.camera.xxx"

Change-Id: Ib2a3d193ca56b51ba1a4f3cea9cf933f8780e78c
CRs-Fixed: 2027214

2 files changed, 21 insertions, 19 deletions

diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java
index 199f31dd6..89c58131a 100644
--- a/src/com/android/camera/util/PersistUtil.java
+++ b/src/com/android/camera/util/PersistUtil.java
@@ -33,31 +33,32 @@ import android.os.SystemProperties;
 public class PersistUtil {
 
     private static final int PERSIST_MEMORY_LIMIT =
-            SystemProperties.getInt("persist.sys.camera.perf.memlimit", 60);
+            SystemProperties.getInt("persist.vendor.camera.perf.memlimit", 60);
     private static final boolean PERSIST_SKIP_MEMORY_CHECK =
-            SystemProperties.getBoolean("persist.sys.camera.perf.skip_memck", false);
+            SystemProperties.getBoolean("persist.vendor.camera.perf.skip_memck", false);
     private static final int PERSIST_LONGSHOT_SHOT_LIMIT =
-            SystemProperties.getInt("persist.sys.camera.longshot.shotnum", 50);
+            SystemProperties.getInt("persist.vendor.camera.longshot.shotnum", 50);
     private static final int PERSIST_CAMERA_PREVIEW_SIZE =
-            SystemProperties.getInt("persist.sys.camera.preview.size", 0);
+            SystemProperties.getInt("persist.vendor.camera.preview.size", 0);
     private static final boolean PERSIST_CAMERA_CAMERA2 =
-            SystemProperties.getBoolean("persist.sys.camera.camera2", false);
+            SystemProperties.getBoolean("persist.vendor.camera.camera2", false);
     private static final boolean PERSIST_CAMERA_ZSL =
-            SystemProperties.getBoolean("persist.sys.camera.zsl.disabled", false);
+            SystemProperties.getBoolean("persist.vendor.camera.zsl.disabled", false);
     private static final int PERSIST_CAMERA2_DEBUG =
-            SystemProperties.getInt("persist.sys.camera2.debug", 0);
+            SystemProperties.getInt("persist.vendor.camera2.debug", 0);
     private static final int PERSIST_CAMERA_CANCEL_TOUCHFOCUS_DELAY =
-            SystemProperties.getInt("persist.sys.camera.focus_delay", 5000);
+            SystemProperties.getInt("persist.vendor.camera.focus_delay", 5000);
     private static final int PERSIST_CAMERA_DEBUG =
-            SystemProperties.getInt("persist.sys.camera.debug", 0);
+            SystemProperties.getInt("persist.vendor.camera.debug", 0);
     private static final String PERSIST_CAMERA_STILLMORE_BRCOLR =
-            SystemProperties.get("persist.sys.camera.stm_brcolor", "0.5");
+            SystemProperties.get("persist.vendor.camera.stm_brcolor", "0.5");
     private static final String PERSIST_CAMERA_STILLMORE_BRINTENSITY =
-            SystemProperties.get("persist.sys.camera.stm_brintensity", "0.6");
+            SystemProperties.get("persist.vendor.camera.stm_brintensity", "0.6");
     private static final String PERSIST_CAMERA_STILLMORE_SMOOTHINGINTENSITY =
-            SystemProperties.get("persist.sys.camera.stm_smooth", "0");
+            SystemProperties.get("persist.vendor.camera.stm_smooth", "0");
     private static final int PERSIST_CAMERA_STILLMORE_NUM_REQUIRED_IMAGE =
-            SystemProperties.getInt("persist.sys.camera.stm_img_nums", 5);
+            SystemProperties.getInt("persist.vendor.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 d3058f709..1e50bb690 100644
--- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java
+++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java
@@ -90,12 +90,13 @@ import com.android.camera.util.CameraUtil;
 
 public class ClearSightImageProcessor {
     private static final String TAG = "ClearSightImageProcessor";
-    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 String PERSIST_DUMP_DEPTH_KEY = "persist.camera.cs.dumpdepth";
+    private static final String PERSIST_TIMESTAMP_LIMIT_KEY = "persist.vendor.camera.cs.threshold";
+    private static final String PERSIST_BURST_COUNT_KEY = "persist.vendor.camera.cs.burstcount";
+    private static final String PERSIST_DUMP_FRAMES_KEY = "persist.vendor.camera.cs.dumpframes";
+    private static final String PERSIST_DUMP_YUV_KEY = "persist.vendor.camera.cs.dumpyuv";
+    private static final String PERSIST_CS_TIMEOUT_KEY = "persist.vendor.camera.cs.timeout";
+    private static final String PERSIST_DUMP_DEPTH_KEY = "persist.vendor.camera.cs.dumpdepth";
+
 
     private static final long DEFAULT_TIMESTAMP_THRESHOLD_MS = 10;
     private static final int DEFAULT_IMAGES_TO_BURST = 4;