Revert "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"

This reverts commit b5533d51a7c97138235d29b35cec876d107aeadd.

Change-Id: I8063422680802e25d03a374be91e884a86ad55e9

1 files changed, 8 insertions, 196 deletions

diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java
index 976389ea2..8c1b57e98 100644
--- a/src/com/android/camera/util/PersistUtil.java
+++ b/src/com/android/camera/util/PersistUtil.java
@@ -28,32 +28,20 @@
  */
 package com.android.camera.util;
 
-import android.graphics.Point;
 import android.os.SystemProperties;
-import android.text.TextUtils;
-import android.util.Log;
 
 public class PersistUtil {
 
-    public static final int CAMERA2_DEBUG_DUMP_IMAGE = 1;
-    public static final int CAMERA2_DEBUG_DUMP_LOG = 2;
-    public static final int CAMERA2_DEBUG_DUMP_ALL = 100;
-
-    private static final int CAMERA_SENSOR_HORIZONTAL_ALIGNED = 0;
-    private static final int CAMERA_SENSOR_VERTICAL_ALIGNED = 1;
-
     private static final int PERSIST_MEMORY_LIMIT =
             SystemProperties.getInt("persist.vendor.camera.perf.memlimit", 60);
     private static final boolean PERSIST_SKIP_MEMORY_CHECK =
             SystemProperties.getBoolean("persist.vendor.camera.perf.skip_memck", false);
     private static final int PERSIST_LONGSHOT_SHOT_LIMIT =
             SystemProperties.getInt("persist.vendor.camera.longshot.shotnum", 50);
-    private static final String PERSIST_CAMERA_PREVIEW_SIZE =
-            SystemProperties.get("persist.vendor.camera.preview.size", "");
+    private static final int PERSIST_CAMERA_PREVIEW_SIZE =
+            SystemProperties.getInt("persist.vendor.camera.preview.size", 0);
     private static final boolean PERSIST_CAMERA_CAMERA2 =
             SystemProperties.getBoolean("persist.vendor.camera.camera2", true);
-    private static final boolean PERSIST_CAMERA_ZSL =
-            SystemProperties.getBoolean("persist.vendor.camera.zsl.disabled", false);
     private static final int PERSIST_CAMERA2_DEBUG =
             SystemProperties.getInt("persist.vendor.camera2.debug", 0);
     private static final int PERSIST_CAMERA_CANCEL_TOUCHFOCUS_DELAY =
@@ -68,59 +56,10 @@ public class PersistUtil {
             SystemProperties.get("persist.vendor.camera.stm_smooth", "0");
     private static final int PERSIST_CAMERA_STILLMORE_NUM_REQUIRED_IMAGE =
             SystemProperties.getInt("persist.vendor.camera.stm_img_nums", 5);
-    private static final String PERSIST_CAMERA_CS_BRINTENSITY_KEY =
-            SystemProperties.get("persist.vendor.camera.sensor.brinten", "0.0");
-    private static final String PERSIST_CAMERA_CS_SMOOTH_KEY =
-            SystemProperties.get("persist.vendor.camera.sensor.smooth", "0.5");
-    private static final int PERSIST_CAMERA_SENSOR_ALIGN_KEY =
-            SystemProperties.getInt("persist.vendor.camera.sensor.align",
-                    CAMERA_SENSOR_HORIZONTAL_ALIGNED);
-    private static final int CIRCULAR_BUFFER_SIZE_PERSIST =
-            SystemProperties.getInt("persist.vendor.camera.zsl.buffer.size", 5);
-    private static final int SAVE_TASK_MEMORY_LIMIT_IN_MB =
-            SystemProperties.getInt("persist.vendor.camera.perf.memlimit", 60);
-    private static final boolean PERSIST_CAMERA_UI_AUTO_TEST_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.ui.auto_test", false);
-    private static final boolean PERSIST_CAMERA_SAVE_IN_SD_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.env.camera.saveinsd", false);
-    private static final boolean PERSIST_LONG_SAVE_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.longshot.save", false);
-    private static final boolean PERSIST_CAMERA_PREVIEW_RESTART_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.feature.restart", false);
-    private static final boolean PERSIST_CAPTURE_ANIMATION_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.capture.animate", true);
-    private static final boolean PERSIST_SKIP_MEM_CHECK_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.perf.skip_memck", false);
-    private static final boolean PERSIST_ZZHDR_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.zzhdr.enable", false);
-    private static final int PERSIST_PREVIEW_SIZE =
-            SystemProperties.getInt("persist.vendor.camera.preview.size", 0);
-    private static final long PERSIST_TIMESTAMP_LIMIT =
-            SystemProperties.getLong("persist.vendor.camera.cs.threshold", 10);
-    private static final int PERSIST_BURST_COUNT =
-            SystemProperties.getInt("persist.vendor.camera.cs.burstcount", 4);
-    private static final boolean PERSIST_DUMP_FRAMES_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.cs.dumpframes", false);
-    private static final boolean PERSIST_DUMP_YUV_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.cs.dumpyuv", false);
-    private static final int PERSIST_CS_TIMEOUT =
-            SystemProperties.getInt("persist.vendor.camera.cs.timeout", 300);
-    private static final boolean PERSIST_DUMP_DEPTH_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.cs.dumpdepth", false);
-    private static final boolean PERSIST_DISABLE_QCOM_MISC_SETTING =
-            SystemProperties.getBoolean("persist.vendor.camera.qcom.misc.disable", false);
-    private static final int PREVIEW_FLIP_VALUE =
-            SystemProperties.getInt("persist.vendor.debug.camera.preview.flip", 0);
-    private static final int PERSIST_VIDEO_FLIP_VALUE =
-            SystemProperties.getInt("persist.vendor.debug.camera.video.flip", 0);
-    private static final int PERSIST_PICTURE_FLIP_VALUE =
-            SystemProperties.getInt("persist.vendor.debug.camera.picture.flip", 0);
-    private static final boolean PERSIST_YV_12_FORMAT_ENABLED =
-            SystemProperties.getBoolean("persist.vendor.camera.debug.camera.yv12", false);
-    private static final String PERSIST_DISPLAY_UMAX =
-            SystemProperties.get("persist.vendor.camera.display.umax", "");
-    private static final String PERSIST_DISPLAY_LMAX =
-            SystemProperties.get("persist.vendor.camera.display.lmax", "");
+
+    public static final int CAMERA2_DEBUG_DUMP_IMAGE = 1;
+    public static final int CAMERA2_DEBUG_DUMP_LOG = 2;
+    public static final int CAMERA2_DEBUG_DUMP_ALL = 100;
 
     public static int getMemoryLimit() {
         return PERSIST_MEMORY_LIMIT;
@@ -133,31 +72,15 @@ public class PersistUtil {
     public static int getLongshotShotLimit() {
         return PERSIST_LONGSHOT_SHOT_LIMIT;
     }
-    public static int getLongshotShotLimit(int defaultValue) {
-        return SystemProperties.getInt("persist.vendor.camera.longshot.shotnum", defaultValue);
-    }
 
-    public static Point getCameraPreviewSize() {
-        Point result = null;
-        if (PERSIST_CAMERA_PREVIEW_SIZE != null) {
-            String[] sourceStrArray = PERSIST_CAMERA_PREVIEW_SIZE.split("x");
-            if (sourceStrArray != null && sourceStrArray.length >= 2) {
-                result = new Point();
-                result.x = Integer.parseInt(sourceStrArray[0]);
-                result.y = Integer.parseInt(sourceStrArray[1]);
-            }
-        }
-        return result;
+    public static int getCameraPreviewSize() {
+        return PERSIST_CAMERA_PREVIEW_SIZE;
     }
 
     public static boolean getCamera2Mode() {
         return PERSIST_CAMERA_CAMERA2;
     }
 
-    public static boolean getCameraZSLDisabled() {
-        return PERSIST_CAMERA_ZSL;
-    }
-
     public static int getCamera2Debug() {
         return PERSIST_CAMERA_DEBUG;
     }
@@ -187,115 +110,4 @@ public class PersistUtil {
     public static int getCancelTouchFocusDelay() {
         return PERSIST_CAMERA_CANCEL_TOUCHFOCUS_DELAY;
     }
-
-    public static float getDualCameraBrIntensity() {
-        return Float.parseFloat(PERSIST_CAMERA_CS_BRINTENSITY_KEY);
-    }
-
-    public static float getDualCameraSmoothingIntensity() {
-        return Float.parseFloat(PERSIST_CAMERA_CS_SMOOTH_KEY);
-    }
-
-    public static boolean getDualCameraSensorAlign() {
-        return PERSIST_CAMERA_SENSOR_ALIGN_KEY == CAMERA_SENSOR_VERTICAL_ALIGNED;
-    }
-
-    public static int getCircularBufferSize(){
-        return CIRCULAR_BUFFER_SIZE_PERSIST;
-    }
-
-    public static int getSaveTaskMemoryLimitInMb(){
-        return SAVE_TASK_MEMORY_LIMIT_IN_MB;
-    }
-
-    public static boolean isAutoTestEnabled(){
-        return PERSIST_CAMERA_UI_AUTO_TEST_ENABLED;
-    }
-
-    public static boolean isSaveInSdEnabled(){
-        return PERSIST_CAMERA_SAVE_IN_SD_ENABLED;
-    }
-
-    public static boolean isLongSaveEnabled(){
-        return PERSIST_LONG_SAVE_ENABLED;
-    }
-
-    public static boolean isPreviewRestartEnabled(){
-        return PERSIST_CAMERA_PREVIEW_RESTART_ENABLED;
-    }
-
-    public static boolean isCaptureAnimationEnabled(){
-        return PERSIST_CAPTURE_ANIMATION_ENABLED;
-    }
-
-    public static boolean isSkipMemoryCheckEnabled(){
-        return PERSIST_SKIP_MEM_CHECK_ENABLED;
-    }
-
-    public static boolean isZzhdrEnabled(){
-        return PERSIST_ZZHDR_ENABLED;
-    }
-
-    public static int getPreviewSize(){
-        //Read Preview Resolution from adb command
-        //value: 0(default) - Default value as per snapshot aspect ratio
-        //value: 1 - 640x480
-        //value: 2 - 720x480
-        //value: 3 - 1280x720
-        //value: 4 - 1920x1080
-        return PERSIST_PREVIEW_SIZE;
-    }
-
-    public static long getTimestampLimit(){
-        return PERSIST_TIMESTAMP_LIMIT;
-    }
-
-    public static int getImageToBurst(){
-        return PERSIST_BURST_COUNT;
-    }
-
-    public static boolean isDumpFramesEnabled(){
-        return PERSIST_DUMP_FRAMES_ENABLED;
-    }
-
-    public static boolean isDumpYUVEnabled(){
-        return PERSIST_DUMP_YUV_ENABLED;
-    }
-
-    public static int getClearSightTimeout(){
-        return PERSIST_CS_TIMEOUT;
-    }
-
-    public static boolean isDumpDepthEnabled() {
-        return PERSIST_DUMP_DEPTH_ENABLED;
-    }
-
-    public static boolean isDisableQcomMiscSetting(){
-        return PERSIST_DISABLE_QCOM_MISC_SETTING;
-    }
-
-    public static int getPreviewFlip() {
-        return PREVIEW_FLIP_VALUE;
-    }
-
-    public static int getVideoFlip() {
-        return PERSIST_VIDEO_FLIP_VALUE;
-    }
-
-    public static int getPictureFlip() {
-        return PERSIST_PICTURE_FLIP_VALUE;
-    }
-
-    public static boolean isYv12FormatEnable() {
-        return PERSIST_YV_12_FORMAT_ENABLED;
-    }
-
-    public static String getDisplayUMax() {
-        return PERSIST_DISPLAY_UMAX;
-    }
-
-    public static String getDisplayLMax() {
-        return PERSIST_DISPLAY_LMAX;
-    }
-
 }