From aa4ad7a6daf990d79fd8f7882027b42c89b44531 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 6 Jun 2019 10:45:00 -0400
Subject: [PATCH] Cherry picks

---
 Scripts/LineageOS-14.1/Functions.sh | 2 ++
 Scripts/LineageOS-15.1/Functions.sh | 2 ++
 Scripts/LineageOS-16.0/Functions.sh | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 81d19a52..f1b344af 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -113,6 +113,8 @@ patchWorkspace() {
 	repopick -it CVE-2019-2033;
 	repopick 248599; #restrict SET_TIME_ZONE permission
 	repopick 248600 248649; #/proc hardening
+	repopick -it n-asb-2019-06;
+	#repopick 249553; #bluetooth: drop connections with weak encryption keys
 
 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
 
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 8c82cc6b..ed99ccb3 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -87,6 +87,8 @@ patchWorkspace() {
 	source build/envsetup.sh;
 	#repopick 219020; #ab-neverallow-user
 	repopick 249193; #update webview
+	repopick -it O_asb_2019-06;
+	#repopick 249549; #bluetooth: drop connections with weak encryption keys
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 1fb813a4..a893d7bb 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -64,6 +64,8 @@ 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 249538; #update webview
+	#repopick -it android-9.0.0_r40;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";