From ec38522af9a3937c0b0f4bfd70026beb171125fc Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sat, 18 Mar 2023 06:02:24 -0400
Subject: [PATCH] Churn

Signed-off-by: Tad <tad@spotco.us>
---
 .../android_frameworks_base/0013-Network_Permission-1.patch | 2 +-
 .../android_frameworks_base/0013-Sensors_Permission.patch   | 2 +-
 .../android_frameworks_base/0013-Special_Permissions.patch  | 4 ++--
 .../android_frameworks_opt_net_wifi/0001-Random_MAC.patch   | 2 +-
 .../android_packages_apps_Updater/0001-Server.patch         | 4 ++--
 .../android_packages_apps_Updater/0002-Tor_Support.patch    | 6 +++---
 .../android_packages_modules_Wifi/0001-Random_MAC.patch     | 2 +-
 Scripts/Common/Fix_CVE_Patchers.sh                          | 6 +++---
 .../CVE_Patchers/android_kernel_motorola_msm8992.sh         | 4 ++--
 .../CVE_Patchers/android_kernel_oneplus_msm8994.sh          | 4 ++--
 Scripts/LineageOS-18.1/Functions.sh                         | 2 +-
 .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh            | 2 +-
 Scripts/LineageOS-19.1/Functions.sh                         | 2 +-
 13 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-1.patch b/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-1.patch
index 955f7249..dad8bebd 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-1.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-1.patch
@@ -23,7 +23,7 @@ index 9bb5aecdac8f..13c77bf16ef6 100644
      <!-- Allows applications to access information about networks.
           <p>Protection level: normal
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index b30bd41d3059..fbe33065e0f9 100644
+index e827b7616a10..92de1b844efa 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 @@ -2649,7 +2649,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0013-Sensors_Permission.patch b/Patches/LineageOS-18.1/android_frameworks_base/0013-Sensors_Permission.patch
index f4a359de..7de7d1de 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/0013-Sensors_Permission.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/0013-Sensors_Permission.patch
@@ -128,7 +128,7 @@ index 189544f98594..9badc8c4d9c0 100644
      field public static final String SENSORS = "android.permission-group.SENSORS";
      field public static final String SMS = "android.permission-group.SMS";
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index fbe33065e0f9..80576d7b3d75 100644
+index 92de1b844efa..499e5b199554 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 @@ -2649,7 +2649,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0013-Special_Permissions.patch b/Patches/LineageOS-18.1/android_frameworks_base/0013-Special_Permissions.patch
index 1778b2b7..4afdcb6d 100644
--- a/Patches/LineageOS-18.1/android_frameworks_base/0013-Special_Permissions.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_base/0013-Special_Permissions.patch
@@ -17,7 +17,7 @@ As a result, PackageManagerService is no longer modified.
  1 file changed, 19 insertions(+), 5 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
-index 0a98b8b0df57..b30bd41d3059 100644
+index f83c3d5145cc..e827b7616a10 100644
 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
 @@ -1461,7 +1461,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
@@ -84,7 +84,7 @@ index 0a98b8b0df57..b30bd41d3059 100644
                                  } else {
                                      if (permState == null) {
                                          // New permission
-@@ -3953,7 +3967,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
+@@ -3960,7 +3974,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
                      && (grantedPermissions == null
                             || ArrayUtils.contains(grantedPermissions, permission))) {
                  final int flags = permissionsState.getPermissionFlags(permission, userId);
diff --git a/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch b/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch
index 2aaa9269..1f09f80c 100644
--- a/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch
@@ -116,7 +116,7 @@ index 14866c87e..8db407fa3 100644
          if (mVerboseLoggingEnabled) {
              final String key = config.getKey();
 diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
-index f40d65624..7276bfb44 100644
+index 8fc91cb09..25304cca4 100644
 --- a/service/java/com/android/server/wifi/WifiConfigManager.java
 +++ b/service/java/com/android/server/wifi/WifiConfigManager.java
 @@ -425,9 +425,14 @@ public class WifiConfigManager {
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 374e514a..355a17a8 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 79ded8f..69a5252 100644
+index c189641..980bed6 100644
 --- a/src/org/lineageos/updater/misc/Utils.java
 +++ b/src/org/lineageos/updater/misc/Utils.java
-@@ -153,16 +153,9 @@ public class Utils {
+@@ -154,16 +154,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 0990ef3b..ce99d284 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 6144ed7..37e81d8 100644
+index 554098e..dbdc983 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 6144ed7..37e81d8 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 69a5252..2b42726 100644
+index 980bed6..73985da 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 69a5252..2b42726 100644
  import java.util.ArrayList;
  import java.util.Enumeration;
  import java.util.HashSet;
-@@ -149,11 +150,75 @@ public class Utils {
+@@ -150,11 +151,75 @@ public class Utils {
          return updates;
      }
  
diff --git a/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch b/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
index b1110ef4..69a5038a 100644
--- a/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
+++ b/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
@@ -64,7 +64,7 @@ index 924cd3345..fa96b73c0 100644
      /**
       * Randomized MAC address to use with this particular network
 diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
-index b0212133a..5f40104ce 100644
+index 1c87eb2fa..9032bfb54 100644
 --- a/service/java/com/android/server/wifi/WifiConfigManager.java
 +++ b/service/java/com/android/server/wifi/WifiConfigManager.java
 @@ -431,6 +431,10 @@ public class WifiConfigManager {
diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh
index 8d6cad9d..0f468575 100644
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@@ -71,10 +71,10 @@ commentPatches android_kernel_lge_msm8996.sh "CVE-2016-6198" "CVE-2017-13162/3.1
 commentPatches android_kernel_moto_shamu.sh "CVE-2014-8559";
 commentPatches android_kernel_motorola_msm8916.sh "0001-LinuxIncrementals/3.10/3.10.0050-0051.patch" "CVE-2014-8559" "CVE-2017-15817" "CVE-2018-9514";
 commentPatches android_kernel_motorola_msm8974.sh "CVE-2016-5696" "CVE-2017-7373" "CVE-2017-17770/3.4/0002.patch" "CVE-2019-11599" "CVE-2022-22058";
-commentPatches android_kernel_motorola_msm8992.sh "CVE-2017-5551/3.10/0002.patch" "CVE-2017-14880/3.10/0001.patch" "CVE-2017-17770/3.4" "CVE-2018-3585/3.10/0001.patch" "CVE-2019-2297/qcacld-2.0/0001.patch";
+commentPatches android_kernel_motorola_msm8992.sh "CVE-2017-5551/3.10/0002.patch" "CVE-2017-14880/3.10/0001.patch" "CVE-2017-17770/3.4" "CVE-2018-3585/3.10/0001.patch" "CVE-2019-2297/qcacld-2.0/0001.patch" "0002-Misc_Fixes-uid/3.10/0002-alt1.patch" "CVE-2017-17712/3.10/0010.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-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" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-42896/4.9";
 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_msm8994.sh "CVE-2018-3585/3.10/0001.patch" "CVE-2018-9514"  "0002-Misc_Fixes-uid/3.10/0002-alt1.patch" "CVE-2017-17712/3.10/0010.patch";
 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" "CVE-2022-42896/4.9";
 commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening-slab" "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-11599" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166";
 commentPatches android_kernel_oneplus_sm7250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2021-30324" "CVE-2021-45469" "CVE-2022-42703/4.19/0003.patch";
@@ -97,7 +97,7 @@ commentPatches android_kernel_sony_sdm845.sh "CVE-2019-19319" "CVE-2020-1749" "C
 commentPatches android_kernel_xiaomi_msm8937.sh "CVE-2017-13162" "CVE-2019-14070" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-42896/4.9";
 commentPatches android_kernel_xiaomi_sdm660.sh "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch";
 commentPatches android_kernel_xiaomi_sm8150.sh "CVE-2020-24588/4.14/0018.patch";
-commentPatches android_kernel_xiaomi_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600";
+commentPatches android_kernel_xiaomi_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2022-22075";
 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" "CVE-2017-11015/prima";
 commentPatches android_kernel_zte_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-13162" "CVE-2017-15951" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-42896/4.9";
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
index 841b0bf4..b0ed80c7 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 if cd "$DOS_BUILD_BASE""kernel/motorola/msm8992"; then
 git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes-uid/3.10/0002-alt1.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes-uid/3.10/0002-alt1.patch
 git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0004-No_dir-relax.patch
 git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0005.patch
@@ -76,7 +76,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16994/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17712/3.10/0010.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17712/3.10/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17741/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/3.18/0003.patch
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
index 24499e48..3bcafe9c 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 if cd "$DOS_BUILD_BASE""kernel/oneplus/msm8994"; then
 git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes-uid/3.10/0002-alt1.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes-uid/3.10/0002-alt1.patch
 git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0004-No_dir-relax.patch
 git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0005.patch
@@ -79,7 +79,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16994/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/3.18/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17712/3.10/0010.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17712/3.10/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17741/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/3.18/0003.patch
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index 8da50386..19680928 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -113,7 +113,7 @@ patchWorkspace() {
 	verifyAllPlatformTags;
 	gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
 
-	#source build/envsetup.sh;
+	source build/envsetup.sh;
 	#repopick -it eleven-firewall;
 	#repopick -i 314453; #TaskViewTouchController: Null check current animation on drag
 	#repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default
diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
index 8c3cb88e..8cea9001 100644
--- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
+++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
@@ -463,7 +463,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22075/ANY/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22075/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22095/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23041/4.19/0004.patch
diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh
index ae744746..d01a14f2 100644
--- a/Scripts/LineageOS-19.1/Functions.sh
+++ b/Scripts/LineageOS-19.1/Functions.sh
@@ -78,7 +78,7 @@ 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