From 56aa41bf47297f0bf037f416e7d68bea40c9f1c8 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 5 Dec 2023 20:18:09 -0500 Subject: [PATCH] Picks Signed-off-by: Tad --- Patches/Common/apns-conf.xml | 113 ++++++++---------- .../0007-Always_Restict_Serial.patch | 2 +- .../0014-Automatic_Reboot.patch | 8 +- .../0018-Exec_Based_Spawning-14.patch | 4 +- .../0001-Hosts_Cache.patch | 10 +- .../0001-Hosts_Wildcards.patch | 2 +- .../0002-hosts_toggle.patch | 2 +- .../0003-Reuse-align_ptr-in-hosts_cache.patch | 2 +- Scripts/LineageOS-20.0/Functions.sh | 1 + Scripts/LineageOS-20.0/Patch.sh | 9 ++ Scripts/Update_Commons.sh | 6 +- 11 files changed, 78 insertions(+), 81 deletions(-) diff --git a/Patches/Common/apns-conf.xml b/Patches/Common/apns-conf.xml index fbe0a77f..a7c9e2d8 100644 --- a/Patches/Common/apns-conf.xml +++ b/Patches/Common/apns-conf.xml @@ -1030,7 +1030,7 @@ - + @@ -2876,68 +2876,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8c667884..ad928fe5 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,7 +10,7 @@ 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 13953d873c0f..62b5df33df15 100644 +index 46f62b83d669..035af8bde9d8 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4866,12 +4866,7 @@ public class ActivityManagerService extends IActivityManager.Stub diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch b/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch index 1ea0b4b2..52eab72c 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch @@ -58,7 +58,7 @@ index dae2e45687bc..286155953bed 100644 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java -index a7d75eeded4d..d93855631b24 100644 +index c03fb003890e..e7d5007b99f6 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -206,6 +206,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, @@ -120,7 +120,7 @@ index a7d75eeded4d..d93855631b24 100644 /** * It will let us know when the device is waking up. */ -@@ -1990,6 +2014,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -1994,6 +2018,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); showLocked(options); @@ -131,7 +131,7 @@ index a7d75eeded4d..d93855631b24 100644 } private void lockProfile(int userId) { -@@ -2174,6 +2202,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -2178,6 +2206,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, } } } @@ -144,7 +144,7 @@ index a7d75eeded4d..d93855631b24 100644 } } }; -@@ -2777,6 +2811,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, +@@ -2781,6 +2815,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mHideAnimationRun = false; adjustStatusBarLocked(); sendUserPresentBroadcast(); 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 e5be629a..3189fddb 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 62b5df33df15..58f379421c3e 100644 +index 035af8bde9d8..b31d139877dd 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java -@@ -18626,4 +18626,10 @@ public class ActivityManagerService extends IActivityManager.Stub +@@ -18633,4 +18633,10 @@ public class ActivityManagerService extends IActivityManager.Stub Trace.traceBegin(traceTag, methodName + subInfo); } } 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 a5f7f5b1..36585e11 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 b0cfee0c..35c47020 100644 +index b0cfee0..35c4702 100644 --- a/Android.bp +++ b/Android.bp @@ -164,6 +164,7 @@ cc_library { @@ -43,7 +43,7 @@ index b0cfee0c..35c47020 100644 "res_comp.cpp", "res_debug.cpp", diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp -index 6674f238..d8542939 100644 +index 6674f23..d854293 100644 --- a/getaddrinfo.cpp +++ b/getaddrinfo.cpp @@ -66,6 +66,8 @@ @@ -71,7 +71,7 @@ index 6674f238..d8542939 100644 cur->ai_next = p; diff --git a/hosts_cache.cpp b/hosts_cache.cpp new file mode 100644 -index 00000000..a40fb403 +index 0000000..a40fb40 --- /dev/null +++ b/hosts_cache.cpp @@ -0,0 +1,523 @@ @@ -600,7 +600,7 @@ index 00000000..a40fb403 +} diff --git a/hosts_cache.h b/hosts_cache.h new file mode 100644 -index 00000000..55138dcb +index 0000000..55138dc --- /dev/null +++ b/hosts_cache.h @@ -0,0 +1,28 @@ @@ -633,7 +633,7 @@ index 00000000..55138dcb + +#endif diff --git a/sethostent.cpp b/sethostent.cpp -index 7f9384c0..f1bf6572 100644 +index 7f9384c..f1bf657 100644 --- a/sethostent.cpp +++ b/sethostent.cpp @@ -43,6 +43,8 @@ diff --git a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch index 1862a067..f664bd45 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch @@ -24,7 +24,7 @@ Change-Id: I4b0bb81699151d5b371850daebf785e35ec9b170 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/hosts_cache.cpp b/hosts_cache.cpp -index a40fb403..258eac1b 100644 +index a40fb40..258eac1 100644 --- a/hosts_cache.cpp +++ b/hosts_cache.cpp @@ -126,7 +126,7 @@ static int cmp_hcent_name(const void *a, const void *b) diff --git a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch index 9f6034bf..35d2378f 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch @@ -10,7 +10,7 @@ Change-Id: Iea165003474e1107dc77980985bf9928c369dbb5 1 file changed, 4 insertions(+) diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp -index d8542939..4760f7fd 100644 +index d854293..4760f7f 100644 --- a/getaddrinfo.cpp +++ b/getaddrinfo.cpp @@ -57,6 +57,7 @@ diff --git a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0003-Reuse-align_ptr-in-hosts_cache.patch b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0003-Reuse-align_ptr-in-hosts_cache.patch index 97501128..61aaafa6 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0003-Reuse-align_ptr-in-hosts_cache.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0003-Reuse-align_ptr-in-hosts_cache.patch @@ -9,7 +9,7 @@ Change-Id: I461718c38ca3c0e372e1cc0e0f0deb74ae5c68bb 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hosts_cache.cpp b/hosts_cache.cpp -index 258eac1b..be8a0ff4 100644 +index 258eac1..be8a0ff 100644 --- a/hosts_cache.cpp +++ b/hosts_cache.cpp @@ -47,10 +47,6 @@ constexpr int MAXADDRS = 35; diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 4e4d5a69..8280baaa 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -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-12 -e 376247; 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..c9d4ced4 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -104,6 +104,10 @@ applyPatch "$DOS_PATCHES/android_build_soong/0001-Enable_fwrapv.patch"; #Use -fw if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; fi; #(GrapheneOS) fi; +if enterAndClear "cts"; then +git fetch https://github.com/LineageOS/android_cts refs/changes/07/376307/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-12 +fi; + if enterAndClear "external/chromium-webview"; then if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available @@ -122,6 +126,11 @@ sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requ fi; fi; +if enterAndClear "external/pdfium"; then +git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/50/376250/1 && git cherry-pick FETCH_HEAD; #T_asb_2023-12 +fi; + + if enterAndClear "frameworks/av"; then git am $DOS_PATCHES/ASB-2023-10/av-*.patch; fi; diff --git a/Scripts/Update_Commons.sh b/Scripts/Update_Commons.sh index 575d29c1..810439df 100644 --- a/Scripts/Update_Commons.sh +++ b/Scripts/Update_Commons.sh @@ -27,13 +27,13 @@ wget "https://raw.githubusercontent.com/GrapheneOS/platform_packages_apps_Dialer #LineageOS Contributors Cloud wget "https://github.com/LineageOS/android_packages_apps_LineageParts/raw/lineage-20.0/assets/contributors.db" -O ../Patches/Common/contributors.db; -#TODO: wireless-regdb +#TODO: wireless-regdb, unused #https://mirrors.edge.kernel.org/pub/software/network/wireless-regdb/ -#Last: 2023/10/03 +#Last: 2023/12/05 #TODO: MMS Configs #https://github.com/GrapheneOS/platform_packages_apps_Messaging -#Last: 2023/10/03 +#Last: 2023/12/05 #TODO: CA store #https://android.googlesource.com/platform/system/ca-certificates