diff options
author | Michael Bestas <mkbestas@lineageos.org> | 2020-01-12 03:07:56 +0200 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2020-01-12 03:24:32 +0200 |
commit | 06515c0f78e5ebb95e22e96924d2382704cdb517 (patch) | |
tree | 1bce4d14ea98463d5bf48632c11c3edaf1ae36ba | |
parent | cdf13feab683c09c43aa1279be4cbe4e3943575e (diff) | |
download | android_packages_apps_Snap-06515c0f78e5ebb95e22e96924d2382704cdb517.tar.gz android_packages_apps_Snap-06515c0f78e5ebb95e22e96924d2382704cdb517.tar.bz2 android_packages_apps_Snap-06515c0f78e5ebb95e22e96924d2382704cdb517.zip |
Snap: Convert leftover persist.camera.* to persist.sys.camera.*
Avoid SELinux denials with property isolation enabled
Change-Id: I10bc0a406b3702d24ccede845a05ad6eb205b062
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 8 | ||||
-rwxr-xr-x | src/com/android/camera/util/PersistUtil.java | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index b713f8f2a..856bd9335 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -227,7 +227,6 @@ public class PhotoModule private static final boolean PERSIST_SKIP_MEM_CHECK = PersistUtil.isSkipMemoryCheckEnabled(); - private static final String PERSIST_LONGSHOT_MAX_SNAP = "persist.camera.longshot.max"; private static int mLongShotMaxSnap = -1; // Constant from android.hardware.Camera.Parameters @@ -1870,8 +1869,7 @@ public class PhotoModule } if (mCameraState == LONGSHOT) { - mLongShotCaptureCountLimit = SystemProperties.getInt( - "persist.camera.longshot.shotnum", 0); + mLongShotCaptureCountLimit = PersistUtil.getLongshotShotLimit(); mLongShotCaptureCount = 1; if(mLongshotSave) { mCameraDevice.takePicture(mHandler, @@ -3870,7 +3868,7 @@ public class PhotoModule Log.v(TAG, "Bokeh Mode = " + bokehMode + " bokehMpo = " + bokehMpo + " bokehBlurDegree = " + bokehBlurDegree); - mLongShotMaxSnap = SystemProperties.getInt(PERSIST_LONGSHOT_MAX_SNAP, -1); + mLongShotMaxSnap = PersistUtil.getLongshotShotMaxSnap(); mParameters.set("max-longshot-snap",mLongShotMaxSnap); } @@ -4102,7 +4100,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 = PersistUtil.getPreviewSize(); switch (preview_resolution) { case 1: { optimalSize.width = 640; diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java index 05a0e91cb..a23634482 100755 --- a/src/com/android/camera/util/PersistUtil.java +++ b/src/com/android/camera/util/PersistUtil.java @@ -125,6 +125,8 @@ public class PersistUtil { SystemProperties.get("persist.sys.camera.display.lmax", ""); private static final int PERSIST_BURST_PREVIEW_REQUEST_NUMS = SystemProperties.getInt("persist.sys.camera.burst.preview.nums", 0); + private static final int PERSIST_LONGSHOT_MAX_SNAP = + SystemProperties.getInt("persist.sys.camera.longshot.max", -1); public static int getMemoryLimit() { return PERSIST_MEMORY_LIMIT; @@ -322,4 +324,8 @@ public class PersistUtil { public static int isBurstShotFpsNums() { return PERSIST_BURST_PREVIEW_REQUEST_NUMS; } + + public static int getLongshotShotMaxSnap() { + return PERSIST_LONGSHOT_MAX_SNAP; + } } |