From 77b7de4b1e7de8c69743c31563c61866a2f50303 Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 9 Nov 2023 17:13:44 -0500 Subject: [PATCH] Picks Signed-off-by: Tad --- Patches/Common/apns-conf.xml | 4 +-- .../0007-Always_Restict_Serial.patch | 4 +-- .../0018-Exec_Based_Spawning-14.patch | 4 +-- .../0001-Remove_Analytics.patch | 26 +++++++++---------- .../0001-Hosts_Cache.patch | 2 +- .../android_kernel_fxtec_sm6115.sh | 6 ++--- Scripts/LineageOS-20.0/Functions.sh | 5 ++-- Scripts/LineageOS-20.0/Patch.sh | 5 ++++ 8 files changed, 30 insertions(+), 26 deletions(-) diff --git a/Patches/Common/apns-conf.xml b/Patches/Common/apns-conf.xml index fd8acc97..fbe0a77f 100644 --- a/Patches/Common/apns-conf.xml +++ b/Patches/Common/apns-conf.xml @@ -518,7 +518,7 @@ - + @@ -1320,7 +1320,7 @@ - + diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch b/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch index 05a42333..8c667884 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch @@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission. 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java -index ba0aaa1b7d8c..b9ca7055d1b9 100644 +index 13953d873c0f..62b5df33df15 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -4850,12 +4850,7 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -4866,12 +4866,7 @@ public class ActivityManagerService extends IActivityManager.Stub ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0018-Exec_Based_Spawning-14.patch b/Patches/LineageOS-20.0/android_frameworks_base/0018-Exec_Based_Spawning-14.patch index 8def94b7..e5be629a 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0018-Exec_Based_Spawning-14.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0018-Exec_Based_Spawning-14.patch @@ -109,10 +109,10 @@ index 749c67abf389..39f08b6a0f15 100644 // classpath. If found, create a PathClassLoader and use it for applicationInit. ClassLoader classLoader = null; diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java -index b9ca7055d1b9..9a2f0619431b 100644 +index 62b5df33df15..58f379421c3e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -18607,4 +18607,10 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -18626,4 +18626,10 @@ public class ActivityManagerService extends IActivityManager.Stub Trace.traceBegin(traceTag, methodName + subInfo); } } diff --git a/Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch b/Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch index 651d467a..54813a62 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch @@ -14,10 +14,10 @@ Change-Id: Ic01c97d6ceac8d324609763973639b41b4581a76 6 files changed, 56 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index a3b2e43..d43a437 100644 +index 44e8323..972ba36 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml -@@ -257,28 +257,6 @@ +@@ -258,28 +258,6 @@ android:resource="@string/summary_empty" /> @@ -47,10 +47,10 @@ index a3b2e43..d43a437 100644 android:name=".profiles.NFCProfile" android:exported="true"> diff --git a/proguard.flags b/proguard.flags -index 9de6495..911b751 100644 +index cfbdae3..8991f2b 100644 --- a/proguard.flags +++ b/proguard.flags -@@ -7,7 +7,6 @@ +@@ -11,7 +11,6 @@ -keep class org.lineageos.lineageparts.gestures.* -keep class org.lineageos.lineageparts.hardware.* -keep class org.lineageos.lineageparts.input.* @@ -59,11 +59,11 @@ index 9de6495..911b751 100644 -keep class org.lineageos.lineageparts.notificationlight.* -keep class org.lineageos.lineageparts.power.* diff --git a/res/values/config.xml b/res/values/config.xml -index a3ee437..c4532c5 100644 +index adfcaa4..4c575f2 100644 --- a/res/values/config.xml +++ b/res/values/config.xml -@@ -17,9 +17,6 @@ - +@@ -6,9 +6,6 @@ + --> - @@ -73,10 +73,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 4c3a92d..9db0d06 100644 +index 0358a7e..f6c27fc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -550,28 +550,6 @@ +@@ -543,28 +543,6 @@ Total commits: %2$s

Last update: %3$s]]> @@ -106,10 +106,10 @@ index 4c3a92d..9db0d06 100644 Auto-rotate screen Rotation settings diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml -index 691ce47..ea2a07b 100644 +index d6b19c0..e356517 100644 --- a/res/xml/parts_catalog.xml +++ b/res/xml/parts_catalog.xml -@@ -75,11 +75,6 @@ +@@ -64,11 +64,6 @@ android:fragment="org.lineageos.lineageparts.statusbar.StatusBarSettings" lineage:xmlRes="@xml/status_bar_settings" /> @@ -122,10 +122,10 @@ index 691ce47..ea2a07b 100644 android:title="@string/power_menu_title" android:fragment="org.lineageos.lineageparts.input.PowerMenuActions" diff --git a/res/xml/trust_preferences.xml b/res/xml/trust_preferences.xml -index 7cebff4..3b89030 100644 +index f28a305..5b62c73 100644 --- a/res/xml/trust_preferences.xml +++ b/res/xml/trust_preferences.xml -@@ -47,9 +47,6 @@ +@@ -36,9 +36,6 @@ android:entryValues="@array/trust_restrict_usb_values" android:defaultValue="0" /> diff --git a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch index 88b7707b..a5f7f5b1 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch @@ -31,7 +31,7 @@ Change-Id: I5926493864d4b1291ae83f8b601bf5dcc54085cd create mode 100644 hosts_cache.h diff --git a/Android.bp b/Android.bp -index 45425aa0..e843654c 100644 +index b0cfee0c..35c47020 100644 --- a/Android.bp +++ b/Android.bp @@ -164,6 +164,7 @@ cc_library { diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh index b88279ff..3d2641c4 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh @@ -80,13 +80,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4133/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4134/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4623/4.12-^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31085/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34324/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-42754/4.19/0003.patch -editKernelLocalversion "-dos.p86" +editKernelLocalversion "-dos.p84" else echo "kernel_fxtec_sm6115 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 7fb92ce9..6819d893 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -110,10 +110,10 @@ buildAll() { buildDevice hotdogb avb; buildDevice coral avb; buildDevice flame avb; - buildDevice vayu avb; + #buildDevice vayu avb; #XXX: no Wi-Fi #SD730 buildDevice sunfish avb; - buildDevice davinci avb; + #buildDevice davinci avb; #XXX: no Wi-Fi #SD632 buildDevice FP3 avb; #SD865 @@ -161,6 +161,7 @@ patchWorkspaceReal() { source build/envsetup.sh; repopick -i 361248; #Launcher3: Allow toggling monochrome icons for all apps + repopick -it T_asb_2023-11 -e 373323; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index cc2ca25b..cab4be2f 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -369,6 +369,7 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Connectivity/0001-Network_Perm fi; if enterAndClear "packages/modules/DnsResolver"; then +git fetch https://github.com/LineageOS/android_packages_modules_DnsResolver refs/changes/20/373320/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-11 applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch"; #DnsResolver: Sort and cache hosts file data for fast lookup (tdm) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch"; #DnsResolver: Support wildcards in cached hosts file (tdm) applyPatch "$DOS_PATCHES/android_packages_modules_DnsResolver/0002-hosts_toggle.patch"; #Add a toggle to disable /etc/hosts lookup (DivestOS) @@ -387,6 +388,10 @@ applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0005-Browser_No_Loc applyPatch "$DOS_PATCHES/android_packages_modules_Permission/0006-Location_Indicators.patch"; #SystemUI: Use new privacy indicators for location (GrapheneOS) fi; +if enterAndClear "packages/modules/StatsD"; then +git fetch https://github.com/LineageOS/android_packages_modules_StatsD refs/changes/21/373321/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-11 +fi; + if enterAndClear "packages/modules/Wifi"; then applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/344228.patch"; #wifi: resurrect mWifiLinkLayerStatsSupported counter (sassmann) applyPatch "$DOS_PATCHES/android_packages_modules_Wifi/0001-Random_MAC.patch"; #Add support for always generating new random MAC (GrapheneOS)