From 9875334547fe07edc53a843da9f5927dc62e8a4d Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 28 Apr 2022 20:17:11 -0400 Subject: [PATCH] Churn Signed-off-by: Tad --- .../LineageOS-19.1/android_bionic/0003-Hosts_Cache.patch | 6 ++++-- .../android_bionic/0003-Hosts_Wildcards.patch | 6 +++--- .../0004-Special_Permission-4.patch | 4 ++-- Scripts/Common/Deblob.sh | 2 +- Scripts/LineageOS-19.1/Patch.sh | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Patches/LineageOS-19.1/android_bionic/0003-Hosts_Cache.patch b/Patches/LineageOS-19.1/android_bionic/0003-Hosts_Cache.patch index cadaf0c6..a0b02840 100644 --- a/Patches/LineageOS-19.1/android_bionic/0003-Hosts_Cache.patch +++ b/Patches/LineageOS-19.1/android_bionic/0003-Hosts_Cache.patch @@ -22,10 +22,10 @@ Change-Id: I3b322883cbc48b0d76a0ce9d149b59faaac1dc58 (cherry picked from commit ed4c3a6bd449a4ed70645071a440ae146f194116) --- libc/dns/net/getaddrinfo.c | 10 + - libc/dns/net/hosts_cache.c | 524 +++++++++++++++++++++++++++++++++++++ + libc/dns/net/hosts_cache.c | 520 +++++++++++++++++++++++++++++++++++++ libc/dns/net/hosts_cache.h | 23 ++ libc/dns/net/sethostent.c | 7 + - 4 files changed, 564 insertions(+) + 4 files changed, 560 insertions(+) create mode 100644 libc/dns/net/hosts_cache.c create mode 100644 libc/dns/net/hosts_cache.h @@ -59,6 +59,7 @@ index d0c11d2b0..cc94b21e2 100644 cur = &sentinel; diff --git a/libc/dns/net/hosts_cache.c b/libc/dns/net/hosts_cache.c new file mode 100644 +index 000000000..52d29e032 --- /dev/null +++ b/libc/dns/net/hosts_cache.c @@ -0,0 +1,520 @@ @@ -612,6 +613,7 @@ index 000000000..fa5488f51 + +int hc_gethtbyname(const char *host, int af, struct getnamaddr *info); diff --git a/libc/dns/net/sethostent.c b/libc/dns/net/sethostent.c +index 483105a95..1399378cd 100644 --- a/libc/dns/net/sethostent.c +++ b/libc/dns/net/sethostent.c @@ -55,6 +55,8 @@ __RCSID("$NetBSD: sethostent.c,v 1.20 2014/03/17 13:24:23 christos Exp $"); diff --git a/Patches/LineageOS-19.1/android_bionic/0003-Hosts_Wildcards.patch b/Patches/LineageOS-19.1/android_bionic/0003-Hosts_Wildcards.patch index 2ba7f2bd..abadbc86 100644 --- a/Patches/LineageOS-19.1/android_bionic/0003-Hosts_Wildcards.patch +++ b/Patches/LineageOS-19.1/android_bionic/0003-Hosts_Wildcards.patch @@ -21,10 +21,10 @@ Change-Id: I4b0bb81699151d5b371850daebf785e35ec9b180 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/libc/dns/net/hosts_cache.c b/libc/dns/net/hosts_cache.c -index deafb78b7..5038986be 100644 +index 52d29e032..fc6370d0c 100644 --- a/libc/dns/net/hosts_cache.c +++ b/libc/dns/net/hosts_cache.c -@@ -121,7 +121,7 @@ static int cmp_hcent_name(const void *a, const void *b) +@@ -117,7 +117,7 @@ static int cmp_hcent_name(const void *a, const void *b) return hstrcmp(na, nb); } @@ -33,7 +33,7 @@ index deafb78b7..5038986be 100644 { size_t first, last, mid; struct hcent *cur = NULL; -@@ -162,6 +162,33 @@ found: +@@ -158,6 +158,33 @@ found: return cur; } diff --git a/Patches/LineageOS-19.1/android_packages_modules_Permission/0004-Special_Permission-4.patch b/Patches/LineageOS-19.1/android_packages_modules_Permission/0004-Special_Permission-4.patch index 8354f8f2..1c0e1115 100644 --- a/Patches/LineageOS-19.1/android_packages_modules_Permission/0004-Special_Permission-4.patch +++ b/Patches/LineageOS-19.1/android_packages_modules_Permission/0004-Special_Permission-4.patch @@ -23,10 +23,10 @@ index 7a086816d..8799a54bd 100644 Not used in past 24 hours diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageV2ControlPreference.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageV2ControlPreference.java -index 794c760d1..6d5eaebe2 100644 +index 15c8d3cff..bba384bb5 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageV2ControlPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageV2ControlPreference.java -@@ -72,7 +72,11 @@ public class PermissionUsageV2ControlPreference extends Preference { +@@ -81,7 +81,11 @@ public class PermissionUsageV2ControlPreference extends Preference { if (mCount == 0) { this.setEnabled(false); diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index fa04d964..7fb4ad7b 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -248,7 +248,7 @@ echo "Deblobbing..."; blobs=$blobs"|HardwareInfo.apk"; blobs=$blobs"|SCONE.apk"; #??? blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk|DeviceIntelligence.*.apk"; - overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence"; + overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService"; #EUICC (Virtual SIM) [Google] #blobs=$blobs"|EuiccGoogle.apk|EuiccSupportPixel.apk"; #EUICC is useless without GMS #XXX: breaks radio diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index c8faeb8f..7c6a1645 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -381,7 +381,7 @@ if [ "$DOS_MICROG_INCLUDED" = "NLP" ]; then echo "PRODUCT_PACKAGES += UnifiedNLP echo "PRODUCT_PACKAGES += eSpeakNG" >> packages.mk; #PicoTTS needs work to compile on 18.1, use eSpeak-NG instead awk -i inplace '!/speed-profile/' build/target/product/lowram.mk; #breaks compile on some dexpreopt devices sed -i 's/wifi,cell/internet/' overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml; #Use the modern quick tile -sed -i 's|system/etc|$(TARGET_COPY_OUT_PRODUCT)/etc|' divested.mk; +sed -i 's|system/etc|$(TARGET_COPY_OUT_PRODUCT)/etc|' divestos.mk; fi; # #END OF ROM CHANGES