diff options
| author | weijiew <weijiew@codeaurora.org> | 2017-05-08 18:29:39 +0800 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2017-07-07 13:47:10 -0700 |
| commit | b9ecba2215ee721588dc7409b303fcefcd4a88e6 (patch) | |
| tree | 47253ab6149eec785848e127e71dc97b04ec741f /src | |
| parent | ebab40036c14291f18667e074a76afa691a83b57 (diff) | |
| download | android_packages_apps_Snap-b9ecba2215ee721588dc7409b303fcefcd4a88e6.tar.gz android_packages_apps_Snap-b9ecba2215ee721588dc7409b303fcefcd4a88e6.tar.bz2 android_packages_apps_Snap-b9ecba2215ee721588dc7409b303fcefcd4a88e6.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/util/PersistUtil.java | 26 | ||||
| -rw-r--r-- | src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java | 12 |
2 files changed, 20 insertions, 18 deletions
diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java index e57d514db..f622c1249 100644 --- a/src/com/android/camera/util/PersistUtil.java +++ b/src/com/android/camera/util/PersistUtil.java @@ -33,29 +33,31 @@ import android.os.SystemProperties; public class PersistUtil { private static final int PERSIST_MEMORY_LIMIT = - SystemProperties.getInt("persist.camera.perf.memlimit", 60); + SystemProperties.getInt("persist.vendor.camera.perf.memlimit", 60); private static final boolean PERSIST_SKIP_MEMORY_CHECK = - SystemProperties.getBoolean("persist.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.camera.longshot.shotnum", 50); + SystemProperties.getInt("persist.vendor.camera.longshot.shotnum", 50); private static final int PERSIST_CAMERA_PREVIEW_SIZE = - SystemProperties.getInt("persist.camera.preview.size", 0); + SystemProperties.getInt("persist.vendor.camera.preview.size", 0); private static final boolean PERSIST_CAMERA_CAMERA2 = - SystemProperties.getBoolean("persist.camera.camera2", true); + SystemProperties.getBoolean("persist.vendor.camera.camera2", true); private static final boolean PERSIST_CAMERA_HAL_ZSL = - SystemProperties.getBoolean("persist.camera.hal_zsl.disabled", false); + SystemProperties.getBoolean("persist.vendor.camera.hal_zsl.disabled", true); + private static final int PERSIST_CAMERA2_DEBUG = + SystemProperties.getInt("persist.vendor.camera2.debug", 0); private static final int PERSIST_CAMERA_CANCEL_TOUCHFOCUS_DELAY = - SystemProperties.getInt("persist.camera.focus_delay", 5000); + SystemProperties.getInt("persist.vendor.camera.focus_delay", 5000); private static final int PERSIST_CAMERA_DEBUG = - SystemProperties.getInt("persist.camera.debug", 0); + SystemProperties.getInt("persist.vendor.camera.debug", 0); private static final String PERSIST_CAMERA_STILLMORE_BRCOLR = - SystemProperties.get("persist.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.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.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.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 c042fba1f..e83e37f88 100644 --- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java +++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java @@ -91,12 +91,12 @@ 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_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; |