Churn

Signed-off-by: Tavi <tavi@divested.dev>
2024-12-18 12:24:21 -05:00 · 2024-03-09 16:35:22 -05:00 · 2024-03-09 16:35:22 -05:00 · c3b07f5e01
commit c3b07f5e01
parent 0b8f1a2c57
15 changed files with 9 additions and 21 deletions
--- a/Patches/LineageOS-19.1/android_frameworks_base/0031-Unprivileged_microG_Handling.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/0031-Unprivileged_microG_Handling.patch
@ -132,7 +132,7 @@ index ed9b539c05df..83cc7a251ebf 100644
                         || newPkg.isForceQueryable()
                         || ArrayUtils.contains(mForceQueryableByDevicePackageNames,
 diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index 5bbde18f7e9e..5eda2166032c 100644
+index e637dcf531f0..80eaaba933d2 100644
 --- a/services/core/java/com/android/server/pm/PackageManagerService.java
 +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -552,6 +552,14 @@ public class PackageManagerService extends IPackageManager.Stub
@ -201,7 +201,7 @@ index 5bbde18f7e9e..5eda2166032c 100644
         public final PackageInfo getPackageInfo(String packageName, int flags, int userId) {
             return getPackageInfoInternal(packageName, PackageManager.VERSION_CODE_HIGHEST,
                     flags, Binder.getCallingUid(), userId);
-@@ -24561,6 +24602,19 @@ public class PackageManagerService extends IPackageManager.Stub
+@@ -24564,6 +24605,19 @@ public class PackageManagerService extends IPackageManager.Stub
             return null;
         }
 
--- a/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
@ -14,10 +14,10 @@ Change-Id: Ic01c97d6ceac8d324609763973639b41b4581a76
 6 files changed, 59 deletions(-)

 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index f5221b2..05bdc54 100644
+index 989678c..6a99a1f 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
-@@ -241,31 +241,6 @@
+@@ -252,31 +252,6 @@
                 android:resource="@string/summary_empty" />
         </activity-alias>
 
@ -76,10 +76,10 @@ 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 a99b565..b89cd2b 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -533,28 +533,6 @@
+@@ -549,28 +549,6 @@
                  <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                  <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
 
@ -109,10 +109,10 @@ index 02a5316..a806a7c 100644
     <string name="accelerometer_title">Auto-rotate screen</string>
     <string name="display_rotation_title">Rotation settings</string>
 diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
-index 803b214..371382c 100644
+index a5e22c3..879f248 100644
 --- a/res/xml/parts_catalog.xml
 +++ b/res/xml/parts_catalog.xml
-@@ -70,11 +70,6 @@
+@@ -75,11 +75,6 @@
           android:fragment="org.lineageos.lineageparts.statusbar.StatusBarSettings"
           lineage:xmlRes="@xml/status_bar_settings" />
 
--- a/Patches/Linux
+++ b/Patches/Linux
@ -1 +1 @@
-Subproject commit e2a3daacc171384dd7317c88bcfafc5972dec479
+Subproject commit 4935844ddfbc9d07a0f63ee58a8d77f5a1f31022
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
@ -248,7 +248,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46910/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46915/4.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46924/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46929/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.14/0002.patch
--- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
+++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
@ -345,7 +345,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46910/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46915/4.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46924/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46929/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.14/0002.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh
@ -61,7 +61,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/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-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46935/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46999/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47058/^5.12/0001.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
@ -65,7 +65,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46958/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46999/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47058/^5.12/0001.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh
@ -61,7 +61,6 @@ 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-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46935/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46999/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47058/^5.12/0001.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@ -320,7 +320,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46910/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46915/4.14/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46924/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46929/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.14/0002.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh
@ -61,7 +61,6 @@ 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-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46935/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46999/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47058/^5.12/0001.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh
@ -291,7 +291,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46906/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46932/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46933/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46935/^5.16/0001.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh
@ -58,7 +58,6 @@ 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-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46999/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47058/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh
@ -63,7 +63,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/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-46909/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46935/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46999/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47058/^5.12/0001.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
@ -68,7 +68,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35085/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46958/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46982/^5.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46999/^5.12/0001.patch
--- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh
+++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh
@ -66,7 +66,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35085/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46912/^5.12/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46921/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46958/^5.12/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46982/^5.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-46999/^5.12/0001.patch