diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0002-Sensors.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0002-Sensors.patch
index 1432f222..de6dfda4 100644
--- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0002-Sensors.patch
+++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0002-Sensors.patch
@@ -44,10 +44,10 @@ index 66c5e069ed..97cbc16b84 100644
"Désactiver VoLTE ?"
"Cela désactive également votre connexion 5G.\nLorsque vous effectuez un appel vocal, vous n\'avez pas accès à Internet et certaines applications peuvent ne pas fonctionner."
diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 9903ac78ac..4659634bc2 100644
+index b2a03f9a46..8eab241cd4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
-@@ -12235,4 +12235,9 @@
+@@ -12237,4 +12237,9 @@
Don\u2019t connect
Connect
diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch
index d1893262..e5f2285c 100644
--- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch
+++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0003-Remove_SensorsOff_Tile.patch
@@ -11,10 +11,10 @@ Change-Id: Ic1dce1c0fffc3c3f6459c4c85e0a64d480d3315a
2 files changed, 55 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 41715ff8c4..7773d31d9a 100644
+index 35915381a1..f9c790839a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
-@@ -3134,19 +3134,6 @@
+@@ -3135,19 +3135,6 @@
android:value="true"/>
diff --git a/Patches/LineageOS-18.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch b/Patches/LineageOS-18.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch
index c88c9bcd..a3a6c77d 100644
--- a/Patches/LineageOS-18.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch
+++ b/Patches/LineageOS-18.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch
@@ -12,12 +12,12 @@ Change-Id: I3f42646ba278ef6d0d4aa7565f8374047d599938
4 files changed, 74 deletions(-)
diff --git a/res/layout/setup_lineage_settings.xml b/res/layout/setup_lineage_settings.xml
-index a222d5b..9645f95 100644
+index 1a3d1af..a7f7b55 100644
--- a/res/layout/setup_lineage_settings.xml
+++ b/res/layout/setup_lineage_settings.xml
-@@ -53,35 +53,6 @@
- android:text="@string/services_explanation"
- android:clickable="true" />
+@@ -59,35 +59,6 @@
+ style="@style/SudItemTitle.GlifDescription"
+ android:text="@string/services_find_privacy_policy" />
-
- {
boolean checked = !mNavKeys.isChecked();
mNavKeys.setChecked(checked);
-@@ -99,19 +91,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
- privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance());
- privacyPolicy.setText(ss);
+@@ -80,19 +72,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
+ ((TextView) findViewById(R.id.privacy_policy)).setText(privacyPolicy);
+ ((TextView) findViewById(R.id.find_privacy_policy)).setText(policySummary);
- View metricsRow = findViewById(R.id.metrics);
- metricsRow.setOnClickListener(mMetricsClickListener);
@@ -139,7 +139,7 @@ index a72d916..b5509cc 100644
View navKeysRow = findViewById(R.id.nav_keys);
navKeysRow.setOnClickListener(mNavKeysClickListener);
mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox);
-@@ -128,7 +107,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
+@@ -109,7 +88,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
public void onResume() {
super.onResume();
updateDisableNavkeysOption();
@@ -147,7 +147,7 @@ index a72d916..b5509cc 100644
}
@Override
-@@ -152,15 +130,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
+@@ -133,15 +111,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
return R.drawable.ic_features;
}
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 39061d5a..dcf8547c 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -97,8 +97,9 @@ 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 ten-firewall;
+ repopick -it Q_asb_2021-12;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 2ce3611f..ac82f177 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -96,6 +96,10 @@ sed -i 's/about to delete/unable to delete/' pico/src/com/svox/pico/LangPackUnin
awk -i inplace '!/deletePackage/' pico/src/com/svox/pico/LangPackUninstaller.java;
fi;
+if enterAndClear "external/tremolo"; then
+git pull https://github.com/LineageOS/android_external_tremolo refs/changes/85/320285/1; #Q_asb_2021-12
+fi;
+
if enterAndClear "frameworks/av"; then
if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_frameworks_av/0001-HM_A2DP_Fix.patch"; fi; #(GrapheneOS)
fi;
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index 9ee4a1a5..42db4326 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -132,7 +132,7 @@ patchWorkspace() {
source build/envsetup.sh;
#repopick -it eleven-firewall;
- repopick -it R_asb_2021-12; #TODO: pick missing
+ repopick -it R_asb_2021-12;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index 8e675d05..3b9d3630 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -83,6 +83,10 @@ if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPI
if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
fi;
+if enterAndClear "external/tremolo"; then
+git pull https://github.com/LineageOS/android_external_tremolo refs/changes/65/319965/1; #R_asb_2021-12
+fi;
+
if enterAndClear "frameworks/base"; then
applyPatch "$DOS_PATCHES/android_frameworks_base/0006-Disable_Analytics.patch"; #Disable/reduce functionality of various ad/analytics libraries
applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS)
@@ -253,6 +257,10 @@ patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --direct
awk -i inplace '!/true cannot be used in user builds/' Android.mk; #Allow ignoring neverallows under -user
fi;
+if enterAndClear "system/tools/aidl"; then
+git pull https://github.com/LineageOS/android_system_tools_aidl refs/changes/82/319982/1; #R_asb_2021-12
+fi;
+
if enterAndClear "system/update_engine"; then
git revert --no-edit c0e056ed5c084ce55557c4aecbad540e2b235785; #Do not skip payload signature verification
fi;