From e0b57197ea02e09d22c33af425659b2c61d2b8a6 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 5 Aug 2022 10:29:14 -0400
Subject: [PATCH] Churn

Signed-off-by: Tad <tad@spotco.us>
---
 .../common/frameworks/base/core/res/res/values/config.xml      | 2 +-
 Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch  | 2 +-
 Scripts/LineageOS-14.1/Functions.sh                            | 1 +
 Scripts/LineageOS-14.1/Patch.sh                                | 2 +-
 Scripts/LineageOS-15.1/Functions.sh                            | 1 +
 Scripts/LineageOS-19.1/Functions.sh                            | 3 ++-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
index 869e0c4c..6e1293e9 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -74,7 +74,7 @@
     <integer name="config_multiuserMaximumUsers">16</integer>
 
     <!-- Remote server that can provide NTP responses. -->
-    <string translatable="false" name="config_ntpServer">1.android.pool.ntp.org</string>
+    <string translatable="false" name="config_ntpServer">2.android.pool.ntp.org</string>
 
     <!-- The default journal mode to use use when Write-Ahead Logging is not active.
          Choices are: OFF, DELETE, TRUNCATE, PERSIST and MEMORY.
diff --git a/Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch b/Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch
index 93d6e9cd..e299b80e 100644
--- a/Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch
+++ b/Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch
@@ -12,7 +12,7 @@ Change-Id: I36cbd7ce1a070201da24dc237154355e780d01b4
  create mode 100644 overlay/packages/services/Telephony/res/values/config.xml
 
 diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
-index 8924e2a..2e7ba44 100644
+index 560ab27..63a5014 100644
 --- a/overlay/frameworks/base/core/res/res/values/config.xml
 +++ b/overlay/frameworks/base/core/res/res/values/config.xml
 @@ -178,7 +178,7 @@
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 6b282c8c..1a1df02c 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -122,6 +122,7 @@ patchWorkspace() {
 	repopick -it n-asb-2022-06;
 	repopick -it n-asb-2022-07;
 	repopick -i 334325; #Modify conditions for preventing updated system apps from being downgraded
+	repopick -it n-asb-2022-08;
 
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 6e702149..f42302b8 100644
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -73,7 +73,7 @@ sed -i '296iLOCAL_AAPT_FLAGS += --auto-add-overlay' core/package_internal.mk;
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk; fi; #Replace the Messaging app with Silence
 awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
 awk -i inplace '!/Exchange2/' target/product/core.mk;
-sed -i 's/2021-06-05/2022-07-05/' core/version_defaults.mk; #Bump Security String #n-asb-2022-07 #XXX
+sed -i 's/2021-06-05/2022-08-05/' core/version_defaults.mk; #Bump Security String #n-asb-2022-08 #XXX
 fi;
 
 if enterAndClear "device/qcom/sepolicy"; then
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 58065d8d..8b766d7e 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -88,6 +88,7 @@ patchWorkspace() {
 
 	#source build/envsetup.sh;
 	#TODO: pull in P_asb_2022-07, and recheck n-asb-2022-07
+	#TODO: pull in n-asb-2022-08
 
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh
index 78ad68ef..0e85c56c 100644
--- a/Scripts/LineageOS-19.1/Functions.sh
+++ b/Scripts/LineageOS-19.1/Functions.sh
@@ -116,7 +116,8 @@ patchWorkspace() {
 	touch DOS_PATCHED_FLAG;
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
-	#source build/envsetup.sh;
+	source build/envsetup.sh;
+	repopick -it S_asb_2022-08;
 
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";