Small tweaks

2024-10-01 01:35:54 -04:00 · 2020-12-12 09:50:27 -05:00 · 2020-12-12 09:50:27 -05:00 · 1be184bac9
commit 1be184bac9
parent 39727cb7c7
44 changed files with 86 additions and 66 deletions
--- a/Manifests/Manifest_LAOS-16.0.xml
+++ b/Manifests/Manifest_LAOS-16.0.xml
@ -209,7 +209,7 @@
 	<!-- OnePlus 5 (cheeseburger) -->
 	<project path="device/oneplus/cheeseburger" name="LineageOS/android_device_oneplus_cheeseburger" remote="github" />
 	<project path="device/oneplus/msm8998-common" name="LineageOS/android_device_oneplus_msm8998-common" remote="github" />
-	<project path="kernel/oneplus/msm8998" name="android-linux-stable/op5" remote="github" revision="lineage-17.1" />
+	<project path="kernel/oneplus/msm8998" name="android-linux-stable/op5" remote="github" revision="4a2f01d2e54014a4ed1572e06c31f64752d8b96c" />

 	<!-- OnePlus 5T (dumpling) -->
 	<project path="device/oneplus/dumpling" name="LineageOS/android_device_oneplus_dumpling" remote="github" />
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@ -221,7 +221,6 @@
 	<!-- OnePlus 5 (cheeseburger) -->
 	<project path="device/oneplus/cheeseburger" name="LineageOS/android_device_oneplus_cheeseburger" remote="github" />
 	<project path="device/oneplus/msm8998-common" name="LineageOS/android_device_oneplus_msm8998-common" remote="github" />
-	<!--<project path="kernel/oneplus/msm8998" name="android-linux-stable/op5" remote="github" />-->
 	<project path="kernel/oneplus/msm8998" name="LineageOS/android_kernel_oneplus_msm8998" remote="github" />

 	<!-- OnePlus 5T (dumpling) -->
--- a/Patches/Linux
+++ b/Patches/Linux
@ -1 +1 @@
-Subproject commit 820892386a814a6e9ce7ea9047c1df5137f5a88b
+Subproject commit e9de127d3c10ac01addc7a8db635a1d4eeb0c646
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8a51fbc4cac07f77ff4cd17b8cfdf6b47b0c8a66
+Subproject commit 3e7211f76dfac3ad45c9a7972167973466f13c65
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@ -49,19 +49,19 @@ commentPatches android_kernel_google_yellowstone.sh "0001-LinuxIncrementals/3.10
 commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514";
 commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166" "CVE-2018-3585" "CVE-2018-9514";
 commentPatches android_kernel_lge_msm8992.sh "CVE-2018-5897" "CVE-2018-11266";
-commentPatches android_kernel_lge_msm8996.sh "CVE-2016-6198" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166";
+commentPatches android_kernel_lge_msm8996.sh "CVE-2016-6198" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166";
 commentPatches android_kernel_motorola_msm8916.sh "0001-LinuxIncrementals/3.10/3.10.0050-0051.patch" "CVE-2018-9514";
 commentPatches android_kernel_motorola_msm8974.sh "CVE-2016-5696" "CVE-2017-7373" "CVE-2017-17770/3.4/0002.patch";
 commentPatches android_kernel_motorola_msm8992.sh "CVE-2017-5551/3.10/0002.patch" "CVE-2017-14880/3.10/0001.patch" "CVE-2018-3585/3.10/0001.patch";
-commentPatches android_kernel_motorola_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-8266" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166";
+commentPatches android_kernel_motorola_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-8266" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166";
 commentPatches android_kernel_nextbit_msm8992.sh "CVE-2018-3585/3.10/0001.patch" "CVE-2018-9514";
 commentPatches android_kernel_oneplus_msm8994.sh "CVE-2018-3585/3.10/0001.patch" "CVE-2018-9514";
-commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166";
+commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166";
 commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599" "CVE-2020-16166";
 commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992";
 commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166";
 commentPatches android_kernel_samsung_smdk4412.sh "CVE-2016-8463/ANY/0001.patch";
-commentPatches android_kernel_samsung_universal8890.sh "CVE-2016-7917" "CVE-2018-1092" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166";
+commentPatches android_kernel_samsung_universal8890.sh "CVE-2016-7917" "CVE-2018-1092" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166";
 commentPatches android_kernel_samsung_universal9810.sh "CVE-2020-1749";
 commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166";
 commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922/^3.19.6/0001.patch" "CVE-2017-11015/prima";
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@ -524,7 +524,7 @@ changeDefaultDNS() {
 	local dnsPrimaryV6="";
 	local dnsSecondary="";
 	local dnsSecondaryV6="";
-	if [ -z "$DNS_PRESET" ]; then
+	if [ ! -z "$DOS_DEFAULT_DNS_PRESET" ]; then
 		if [[ "$DOS_DEFAULT_DNS_PRESET" == "AdGuard" ]]; then #https://adguard.com/en/adguard-dns/overview.html
 			dnsPrimary="176.103.130.130";
 			dnsPrimaryV6="2a00:5a60::ad1:0ff";
@ -617,7 +617,7 @@ changeDefaultDNS() {
 			dnsSecondaryV6="2a02:6b8:0:1::feed:0ff";
 		fi;
 	else
-		echo "You must first set a preset via the DEFAULT_DNS_PRESET variable in init.sh!";
+		echo "You must first set a preset via the DOS_DEFAULT_DNS_PRESET variable in init.sh!";
 	fi;

 	local files="core/res/res/values/config.xml packages/SettingsLib/res/values/strings.xml services/core/java/com/android/server/connectivity/NetworkDiagnostics.java services/core/java/com/android/server/connectivity/Tethering.java services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java services/java/com/android/server/connectivity/Tethering.java";
--- a/Scripts/Generate_Signing_Keys.sh
+++ b/Scripts/Generate_Signing_Keys.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #DivestOS: A privacy focused mobile distribution
 #Copyright (c) 2018-2020 Divested Computing Group
 #
--- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh
+++ b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh
@ -70,6 +70,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2635/^3.8.4/0001.patch
@ -447,5 +448,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p447"
+editKernelLocalversion "-dos.p448"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh
@ -60,6 +60,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2635/^3.8.4/0001.patch
@ -424,5 +425,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p424"
+editKernelLocalversion "-dos.p425"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh
@ -58,6 +58,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2635/^3.8.4/0001.patch
@ -405,5 +406,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p405"
+editKernelLocalversion "-dos.p406"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh
@ -56,6 +56,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2635/^3.8.4/0001.patch
@ -342,5 +343,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p342"
+editKernelLocalversion "-dos.p343"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh
@ -58,6 +58,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2635/^3.8.4/0001.patch
@ -347,5 +348,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p347"
+editKernelLocalversion "-dos.p348"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh
@ -56,6 +56,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2595/ANY/kernel.msm.git-3d1d825fe450304ce150559a1c5ffba068824629.patch
@ -325,5 +326,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p325"
+editKernelLocalversion "-dos.p326"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh
@ -57,6 +57,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2635/^3.8.4/0001.patch
@ -309,5 +310,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p309"
+editKernelLocalversion "-dos.p310"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh
@ -536,7 +536,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
@ -602,7 +602,7 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0004-net-add-recursion-limit-
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh
@ -24,6 +24,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2140/^3.10.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2850/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2852/^3.9.4/0001.patch
@ -349,5 +350,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p349"
+editKernelLocalversion "-dos.p350"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
@ -283,7 +283,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15857/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15858/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.18/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16527/3.18/0004.patch
@ -603,7 +603,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
@ -480,7 +480,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
@ -546,7 +546,7 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0004-net-add-recursion-limit-
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
 editKernelLocalversion "-dos.p549"
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
@ -508,7 +508,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@ -119,9 +119,9 @@ patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi;
 	source build/envsetup.sh;
 	repopick -it n_asb_09-2018-qcom;
+	#repopick -it bt-sbc-hd-dualchannel-nougat;
 	repopick -it ibss-mode-nougat;
 	repopick -it n-asb-2020-11;
-	repopick -i 293123; #update webview
 	repopick -it n-asb-2020-12;

 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh
@ -55,6 +55,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2635/^3.8.4/0001.patch
@ -305,5 +306,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p305"
+editKernelLocalversion "-dos.p306"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh
@ -56,6 +56,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2595/ANY/kernel.msm.git-3d1d825fe450304ce150559a1c5ffba068824629.patch
@ -347,5 +348,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p347"
+editKernelLocalversion "-dos.p348"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh
@ -115,7 +115,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15814/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15846/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15851/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15857/3.18/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16536/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16994/3.18/0007.patch
@ -361,7 +361,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
@ -130,7 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15649/^4.13.6/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15842/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15843/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15853/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16527/3.18/0004.patch
@ -460,7 +460,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
@ -400,7 +400,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
@ -462,7 +462,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
 editKernelLocalversion "-dos.p465"
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@ -66,10 +66,10 @@ buildAll() {
 	buildDevice dragon verity;

 	#The following are all superseded, and should only be enabled if the newer version is broken (not building/booting/etc.)
-	buildDevice flo;
 	buildDevice fugu;
 	if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then
 		buildDevice mako;
+		buildDevice flo;
 		buildDevice crackling;
 		buildDevice d802;
 		buildDevice bacon;
@ -111,7 +111,6 @@ patchWorkspace() {
 	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;
-	repopick -i 293123; #update webview
 	repopick -it O_asb_2020-12;

 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@ -103,6 +103,9 @@ if [ "$DOS_MICROG_INCLUDED" != "FULL" ]; then rm -rf packages/CompanionDeviceMan
 rm -rf packages/Osu packages/Osu2; #Automatic Wi-Fi connection non-sense
 rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps

+enterAndClear "frameworks/layoutlib";
+git pull "https://github.com/LineageOS/android_frameworks_layoutlib" refs/changes/53/295953/1; #O_asb_2020-12
+
 if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
 enterAndClear "frameworks/opt/net/ims";
 patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed
@ -172,6 +175,9 @@ git revert --no-edit a6a4ce8e9a6d63014047a447c6bb3ac1fa90b3f4; #Always update re
 patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysfs changes (GrapheneOS)
 if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES_COMMON/android_system_core/0001-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)

+enterAndClear "system/media";
+git pull "https://github.com/LineageOS/android_system_media" refs/changes/57/295957/1; #O_asb_2020-12
+
 enterAndClear "system/sepolicy";
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/26.0";
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh
@ -91,12 +91,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
-editKernelLocalversion "-dos.p98"
+editKernelLocalversion "-dos.p96"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh
@ -54,6 +54,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2635/^3.8.4/0001.patch
@ -286,5 +287,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p286"
+editKernelLocalversion "-dos.p287"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh
@ -56,6 +56,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2141/^3.8.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2147/^3.9.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2148/^3.9.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2164/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2206/^3.8.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2232/^3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2595/ANY/kernel.msm.git-3d1d825fe450304ce150559a1c5ffba068824629.patch
@ -346,5 +347,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p346"
+editKernelLocalversion "-dos.p347"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh
@ -103,7 +103,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15853/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16536/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch
@ -318,7 +318,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh
@ -103,7 +103,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16536/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch
@ -315,7 +315,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@ -395,5 +395,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
-editKernelLocalversion "-dos.p395"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
+editKernelLocalversion "-dos.p396"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@ -134,7 +134,6 @@ patchWorkspace() {
 	repopick -i 232948; #wahoo: liblight: close fd
 	#repopick -it pie-firewall;
 	#repopick -it CVE-2019-2306_P;
-	repopick -i 293123; #update webview
 	repopick -it P_asb_2020-12;

 	source "$DOS_SCRIPTS/Patch.sh";
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@ -164,9 +164,12 @@ git revert --no-edit b3609d82999d23634c5e6db706a3ecbc5348309a; #Always update re
 patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysfs changes (GrapheneOS)
 if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES_COMMON/android_system_core/0001-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)

-enterAndClear "system/extras"
+enterAndClear "system/extras";
 patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)

+enterAndClear "system/media";
+git pull "https://github.com/LineageOS/android_system_media" refs/changes/57/295857/1; #P_asb_2020-12
+
 enterAndClear "system/sepolicy";
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/28.0";
@ -275,6 +278,9 @@ git revert --no-edit 568f99db3c9a590912f533fa734c46cf7a25dcbd; #Resurrect dm-ver
 enterAndClear "kernel/google/wahoo";
 sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO

+enterAndClear "kernel/google/yellowstone";
+git revert --no-edit a045e5bf915284ab76f01debe068ede5998fbaa8; #fails to compile
+
 #Make changes to all devices
 cd "$DOS_BUILD_BASE";
 if [ "$DOS_LOWRAM_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableLowRam "{}"'; fi;
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh
@ -91,12 +91,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
-editKernelLocalversion "-dos.p98"
+editKernelLocalversion "-dos.p96"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh
@ -177,5 +177,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
-editKernelLocalversion "-dos.p177"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
+editKernelLocalversion "-dos.p178"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh
@ -107,7 +107,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16536/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16994/3.18/0007.patch
@ -354,7 +354,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh
@ -46,7 +46,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6695/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8464/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9576/3.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
@ -109,7 +108,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/^4.18.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20836/^4.20/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2181/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/^5.0.17/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11486/^5.0.8/0001.patch
@ -160,5 +158,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
-editKernelLocalversion "-dos.p160"
+editKernelLocalversion "-dos.p158"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
@ -103,7 +103,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15853/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16536/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch
@ -318,7 +318,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
@ -102,7 +102,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch
@ -270,7 +270,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/3.18/0002.patch
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@ -314,5 +314,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
-editKernelLocalversion "-dos.p314"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
+editKernelLocalversion "-dos.p315"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@ -129,8 +129,6 @@ patchWorkspace() {
 	repopick -i 287339; #releasetools: python3 fix
 	#repopick -it ten-firewall;
 	#repopick -it CVE-2019-2306;
-	repopick -i 293123; #update webview
-	repopick -it Q_asb_2020-12;

 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@ -173,7 +173,7 @@ git revert --no-edit bd4142eab8b3cead0c25a2e660b4b048d1315d3c; #Always update re
 patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysfs changes (GrapheneOS)
 if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_system_core/0002-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)

-enterAndClear "system/extras"
+enterAndClear "system/extras";
 patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)

 enterAndClear "system/sepolicy";
@ -214,6 +214,7 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All
 #START OF DEVICE CHANGES
 #
 enterAndClear "device/asus/flox";
+git revert --no-edit f638a192cbef0045b6235fdd8fe28ee500ff7527; #conflict
 compressRamdisks;
 rm -rf bdAddrLoader; #duplicate with mako
 echo "/dev/block/platform/msm_sdcc\.1/by-name/misc u:object_r:misc_block_device:s0" >> sepolicy/file_contexts;
@ -288,6 +289,9 @@ enterAndClear "device/oppo/msm8974-common";
 sed -i 's/libinit_msm8974/libinit_msm8974-oppo/' BoardConfigCommon.mk init/Android.bp; #Fix name conflict
 sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/

+enterAndClear "device/samsung/jf-common";
+sed -i 's/libqdi.so520afba19b0d10aa76c8c211db6bc3a063d44647/libqdi.so|520afba19b0d10aa76c8c211db6bc3a063d44647/' proprietary-files.txt; #Fixup fefcb055ed3a867719a52d232a3f72509400be1e
+
 enterAndClear "device/samsung/msm8974-common";
 echo "TARGET_RECOVERY_DENSITY := hdpi" >> BoardConfigCommon.mk;
 echo "allow hal_gnss_default ssr_device:chr_file { open read };" >> sepolicy/common/hal_gnss_default.te;