Churn

Signed-off-by: Tad <tad@spotco.us>

Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch

@@ -14,7 +14,7 @@ Change-Id: Ic01c97d6ceac8d324609763973639b41b4581a76
  6 files changed, 59 deletions(-)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 5762dc3..e4e1608 100644
+index 4f99b4c..d7a6c12 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
 @@ -240,31 +240,6 @@
@@ -76,7 +76,7 @@ index a3ee437..c4532c5 100644
           The array should be sorted in the same order as the
           touchscreen gestures advertised by the device's LineageHW impl. -->
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 02a5316..a806a7c 100644
+index f7cf730..2f6c4d3 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
 @@ -533,28 +533,6 @@

Patches/LineageOS-20.0/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 011dc8a..914ae6a 100644
+index d768f62..77e7af6 100644
 --- a/src/org/lineageos/updater/misc/Utils.java
 +++ b/src/org/lineageos/updater/misc/Utils.java
-@@ -154,16 +154,9 @@ public class Utils {
+@@ -155,16 +155,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));

Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch

@@ -33,7 +33,7 @@ index cc485f7..7cdfb93 100644
          android:allowBackup="false"
          android:icon="@mipmap/ic_launcher"
 diff --git a/res/layout/preferences_dialog.xml b/res/layout/preferences_dialog.xml
-index c586f44..b1536ea 100644
+index c1b4356..93f1bfc 100644
 --- a/res/layout/preferences_dialog.xml
 +++ b/res/layout/preferences_dialog.xml
 @@ -29,6 +29,14 @@
@@ -52,7 +52,7 @@ index c586f44..b1536ea 100644
          android:id="@+id/preferences_auto_delete_updates"
          android:layout_width="match_parent"
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index bfb2627..916e1e6 100644
+index 18e3ede..e92eb1d 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
 @@ -70,6 +70,7 @@
@@ -72,7 +72,7 @@ index bfb2627..916e1e6 100644
      <string name="snack_update_not_installable">This update can\'t be installed on top of the current build.</string>
  
 diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
-index 9c56f0b..766fb83 100644
+index b1365cc..de386c3 100644
 --- a/src/org/lineageos/updater/UpdatesActivity.java
 +++ b/src/org/lineageos/updater/UpdatesActivity.java
 @@ -377,10 +377,14 @@ public class UpdatesActivity extends UpdatesListActivity {
@@ -96,26 +96,26 @@ index 9c56f0b..766fb83 100644
          Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval);
 +        SwitchCompat onionRouting = view.findViewById(R.id.preferences_onion_routing);
          SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates);
-         SwitchCompat dataWarning = view.findViewById(R.id.preferences_mobile_data_warning);
+         SwitchCompat meteredNetworkWarning = view.findViewById(
-         SwitchCompat abPerfMode = view.findViewById(R.id.preferences_ab_perf_mode);
+                 R.id.preferences_metered_network_warning);
-@@ -491,6 +496,7 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -492,6 +497,7 @@ public class UpdatesActivity extends UpdatesListActivity {
  
          SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
          autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this));
 +        onionRouting.setChecked(prefs.getBoolean(Constants.PREF_ONION_ROUTING, false));
          autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false));
-         dataWarning.setChecked(prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true));
+         meteredNetworkWarning.setChecked(prefs.getBoolean(Constants.PREF_METERED_NETWORK_WARNING,
-         abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, false));
+                 prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true)));
-@@ -530,6 +536,8 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -532,6 +538,8 @@ public class UpdatesActivity extends UpdatesListActivity {
                      prefs.edit()
                              .putInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL,
                                      autoCheckInterval.getSelectedItemPosition())
 +                            .putBoolean(Constants.PREF_ONION_ROUTING,
 +                                    onionRouting.isChecked() && Utils.isOrbotInstalled(getApplicationContext()))
                              .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked())
-                             .putBoolean(Constants.PREF_MOBILE_DATA_WARNING, dataWarning.isChecked())
+                             .putBoolean(Constants.PREF_METERED_NETWORK_WARNING,
-                             .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked())
+                                     meteredNetworkWarning.isChecked())
-@@ -542,6 +550,10 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -545,6 +553,10 @@ public class UpdatesActivity extends UpdatesListActivity {
                          UpdatesCheckReceiver.cancelUpdatesCheck(this);
                      }
  
@@ -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 beb9423..a51ab15 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 {
@@ -306,12 +306,12 @@ index 6144ed7..37e81d8 100644
 +    public static final String PREF_ONION_ROUTING = "onion_routing";
      public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates";
      public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
-     public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
+     public static final String PREF_METERED_NETWORK_WARNING = "pref_metered_network_warning";
 diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
-index 914ae6a..3eee6a7 100644
+index 77e7af6..79e5dce 100644
 --- a/src/org/lineageos/updater/misc/Utils.java
 +++ b/src/org/lineageos/updater/misc/Utils.java
-@@ -45,6 +45,7 @@ import java.io.BufferedReader;
+@@ -46,6 +46,7 @@ import java.io.BufferedReader;
  import java.io.File;
  import java.io.FileReader;
  import java.io.IOException;
@@ -319,7 +319,7 @@ index 914ae6a..3eee6a7 100644
  import java.util.ArrayList;
  import java.util.Enumeration;
  import java.util.HashSet;
-@@ -150,11 +151,75 @@ public class Utils {
+@@ -151,11 +152,75 @@ public class Utils {
          return updates;
      }
  

Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 if cd "$DOS_BUILD_BASE""kernel/fxtec/sm6115"; then
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0280-0281.patch --exclude=Makefile
 git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.19/0003.patch
@@ -71,7 +70,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.19/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4744/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
@@ -79,19 +77,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0386/^6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1380/4.19/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1670/4.19/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1989/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2002/3.10-^6.3/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2194/4.19/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2248/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2269/4.19/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2483/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/4.19/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/^6.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32233/4.19/0002.patch
-editKernelLocalversion "-dos.p91"
+editKernelLocalversion "-dos.p82"
 else echo "kernel_fxtec_sm6115 is unavailable, not patching.";
 fi;
 cd "$DOS_BUILD_BASE"

Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh

@@ -51,11 +51,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3674/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/4.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/4.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35084/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35119/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39792/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch
@@ -74,12 +71,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch
-#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25715/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25722/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28388/4.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-33225/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0394/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0458/4.14/0003.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0461/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1073/4.14/0002.patch
@@ -104,7 +99,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/000
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-slab/4.9/0005.patch
-editKernelLocalversion "-dos.p104"
+editKernelLocalversion "-dos.p99"
 else echo "kernel_xiaomi_msm8937 is unavailable, not patching.";
 fi;
 cd "$DOS_BUILD_BASE"

Scripts/LineageOS-20.0/Patch.sh

@@ -478,9 +478,9 @@ if enterAndClear "kernel/oneplus/sm7250"; then
 git revert --no-edit 6eede8c64f268991abe669a6123e929e295fac29;
 fi;
 
-if enterAndClear "kernel/oneplus/sm8250"; then
+#if enterAndClear "kernel/oneplus/sm8250"; then
-git revert --no-edit 6eede8c64f268991abe669a6123e929e295fac29;
+#git revert --no-edit 6eede8c64f268991abe669a6123e929e295fac29;
-fi;
+#fi;
 
 #Make changes to all devices
 cd "$DOS_BUILD_BASE";