diff --git a/Patches/LineageOS-19.1/android_packages_apps_Settings/0014-LTE_Only_Mode.patch b/Patches/LineageOS-19.1/android_packages_apps_Settings/0014-LTE_Only_Mode.patch index ca8d3215..67cdb612 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Settings/0014-LTE_Only_Mode.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Settings/0014-LTE_Only_Mode.patch @@ -12,10 +12,10 @@ Unlike 11, enable LTE only when World mode is enabled also and ignore CarrierCon 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml -index b7b7c99c1f..ad7e2984a3 100644 +index a08ac6d939..8077b9e8c8 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml -@@ -1494,6 +1494,9 @@ +@@ -1488,6 +1488,9 @@ 4 @@ -25,7 +25,7 @@ index b7b7c99c1f..ad7e2984a3 100644 @string/network_lte @string/network_3G -@@ -1583,7 +1586,7 @@ +@@ -1577,7 +1580,7 @@ CDMA + LTE/EvDo GSM/WCDMA/LTE LTE/CDMA/EvDo/GSM/WCDMA diff --git a/Patches/LineageOS-19.1/android_packages_apps_Updater/0001-Server.patch b/Patches/LineageOS-19.1/android_packages_apps_Updater/0001-Server.patch index 355a17a8..374e514a 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Updater/0001-Server.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Updater/0001-Server.patch @@ -9,10 +9,10 @@ Change-Id: I26dc2942736cf0cfe4e7b92ddfdd04b9d74dbae5 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java -index c189641..980bed6 100644 +index 79ded8f..69a5252 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java -@@ -154,16 +154,9 @@ public class Utils { +@@ -153,16 +153,9 @@ public class Utils { String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL); String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE, SystemProperties.get(Constants.PROP_DEVICE)); diff --git a/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch b/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch index ce99d284..0990ef3b 100644 --- a/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch +++ b/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch @@ -296,7 +296,7 @@ index b9c4b5d..b94fff0 100644 mClient.connect(); int responseCode = mClient.getResponseCode(); diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java -index 554098e..dbdc983 100644 +index 6144ed7..37e81d8 100644 --- a/src/org/lineageos/updater/misc/Constants.java +++ b/src/org/lineageos/updater/misc/Constants.java @@ -30,6 +30,7 @@ public final class Constants { @@ -308,7 +308,7 @@ index 554098e..dbdc983 100644 public static final String PREF_AB_PERF_MODE = "ab_perf_mode"; public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning"; diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java -index 980bed6..73985da 100644 +index 69a5252..2b42726 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -44,6 +44,7 @@ import java.io.BufferedReader; @@ -319,7 +319,7 @@ index 980bed6..73985da 100644 import java.util.ArrayList; import java.util.Enumeration; import java.util.HashSet; -@@ -150,11 +151,75 @@ public class Utils { +@@ -149,11 +150,75 @@ public class Utils { return updates; } diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 6ba50ecd..913ef58c 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -74,10 +74,9 @@ patchWorkspace() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -it twelve-colors; - repopick -if 330099; #Updater: Add prop for allowing major updates sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 597cfe17..8c9f4fea 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -429,7 +429,6 @@ fi; # if enterAndClear "device/essential/mata"; then echo "allow permissioncontroller_app tethering_service:service_manager find;" > sepolicy/private/permissioncontroller_app.te; -echo "lineage.updater.allow_major_update=true" >> system.prop; #mata has semi-broken recovery, allow major updates via Updater fi; if enterAndClear "kernel/fairphone/sdm632"; then diff --git a/Scripts/WebView_Update_Repo.sh b/Scripts/WebView_Update_Repo.sh index 57701c25..76a7cdfb 100644 --- a/Scripts/WebView_Update_Repo.sh +++ b/Scripts/WebView_Update_Repo.sh @@ -16,7 +16,7 @@ umask 0022; set -uo pipefail; -export version="110.0.5481.61-1"; +export version="109.0.5414.118-1"; export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0; export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk"; export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk";