Merge branch 'lineage-18.1' of https://github.com/LineageOS/android_packages_apps_Snap into HEADHEADs12.1

Change-Id: Ia09760085480a6a028c8969f16f503070ab816e5

6 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java
index d1144956f..d1144956f 100755..100644
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
diff --git a/src/com/android/camera/util/AutoTestUtil.java b/src/com/android/camera/util/AutoTestUtil.java
index 4d8cc107e..4d8cc107e 100755..100644
--- a/src/com/android/camera/util/AutoTestUtil.java
+++ b/src/com/android/camera/util/AutoTestUtil.java
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 89e877087..89e877087 100755..100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java
index ce4466d4a..d2165ce42 100644..100755
--- a/src/com/android/camera/util/PersistUtil.java
+++ b/src/com/android/camera/util/PersistUtil.java
@@ -91,6 +91,8 @@ public class PersistUtil {
             getInt("persist.sys.camera.perf.memlimit", 120);
     private static final boolean PERSIST_CAMERA_UI_AUTO_TEST_ENABLED =
             getBoolean("persist.sys.camera.ui.auto_test", false);
+    private static final boolean PERSIST_CAMERA_SAVE_IN_SD_ENABLED =
+            getBoolean("persist.sys.env.camera.saveinsd", false);
     private static final boolean PERSIST_LONG_SAVE_ENABLED =
             getBoolean("persist.sys.camera.longshot.save", false);
     private static final boolean PERSIST_CAMERA_PREVIEW_RESTART_ENABLED =
@@ -315,6 +317,10 @@ public class PersistUtil {
         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;
     }
diff --git a/src/com/android/camera/util/SettingTranslation.java b/src/com/android/camera/util/SettingTranslation.java
index f873799d6..f873799d6 100755..100644
--- a/src/com/android/camera/util/SettingTranslation.java
+++ b/src/com/android/camera/util/SettingTranslation.java
diff --git a/src/com/android/camera/util/VendorTagUtil.java b/src/com/android/camera/util/VendorTagUtil.java
index 1c3160312..1c3160312 100755..100644
--- a/src/com/android/camera/util/VendorTagUtil.java
+++ b/src/com/android/camera/util/VendorTagUtil.java