From 3e62262e88b29a44f5901eff8d96d7dfbfe7eabf Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 6 Nov 2021 19:12:28 -0400 Subject: [PATCH] Small fixup Signed-off-by: Tad --- .../0002-Sensors.patch | 28 +++++++++++-------- Scripts/Common/Fix_CVE_Patchers.sh | 2 +- .../android_kernel_fairphone_sdm632.sh | 2 +- Scripts/LineageOS-18.1/Functions.sh | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0002-Sensors.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0002-Sensors.patch index a7a3593d..1432f222 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0002-Sensors.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0002-Sensors.patch @@ -16,29 +16,33 @@ Change-Id: I79c0ed4ab97494434edc6c308a8a54bd123c02ee create mode 100644 src/com/android/settings/applications/specialaccess/sensor/SensorAccess.java diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml -index b2acb11e61..f5815df4a8 100644 +index 14ea8dd84f..1bd3acf6c9 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml -@@ -4969,4 +4969,7 @@ - "Ein nicht vertrauenswürdiges Gerät fordert Zugriff auf deine Kontakte und deine Anrufliste an. Weitere Informationen." - "Möchtest du den Zugriff auf Kontakte und Anrufliste zulassen?" - "Ein nicht vertrauenswürdiges Bluetooth-Gerät (%1$s) möchte auf deine Kontakte und deine Anrufliste zugreifen. Dazu gehören auch Daten über ein- und ausgehende Anrufe.\n\nDu warst bisher noch nicht mit %2$s verbunden." +@@ -4945,6 +4945,9 @@ + + + + Sensorzugriff von Benutzer-Apps kontrollieren + Zugriff auf Sensoren + Keine installierte App hat Sensorzugriff angefordert. - + "Streamen beenden" + "VoLTE deaktivieren?" + "Dadurch wird auch deine 5G-Verbindung deaktiviert.\nWährend eines Sprachanrufs kannst du das Internet nicht nutzen und manche Apps funktionieren möglicherweise nicht." diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml -index 42545707e6..d65e050664 100644 +index 66c5e069ed..97cbc16b84 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml -@@ -4968,4 +4968,7 @@ - "Un appareil non vérifié souhaite accéder à vos contacts et à votre journal d\'appels. Appuyez ici pour plus de détails." - "Autoriser l\'accès aux contacts et au journal d\'appels ?" - "Un appareil Bluetooth non vérifié, %1$s, souhaite accéder à vos contacts et à votre journal d\'appels. Ceci inclut des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connecté à %2$s auparavant." +@@ -4944,6 +4944,9 @@ + + + + Contrôler l\'accès des applications utilisateurs aux capteurs + Access aux Capteurs + Aucune app installée n\'a demandé de l\'accès aux capteurs. - + "Arrêter la diffusion" + "Désactiver VoLTE ?" + "Cela désactive également votre connexion 5G.\nLorsque vous effectuez un appel vocal, vous n\'avez pas accès à Internet et certaines applications peuvent ne pas fonctionner." diff --git a/res/values/strings.xml b/res/values/strings.xml index 9903ac78ac..4659634bc2 100644 --- a/res/values/strings.xml diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 306c2a7f..97ddf468 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -39,7 +39,7 @@ commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch commentPatches android_kernel_cyanogen_msm8974.sh "CVE-2017-7373"; commentPatches android_kernel_essential_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2017-13218" "CVE-2019-14047/ANY/0002.patch"; commentPatches android_kernel_fairphone_msm8974.sh "CVE-2018-20169"; -commentPatches android_kernel_fairphone_sdm632.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-3347"; +commentPatches android_kernel_fairphone_sdm632.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-3347" "CVE-2021-20322"; commentPatches android_kernel_fxtec_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599" "CVE-2019-16746" "CVE-2019-18282" "CVE-2019-19319" "CVE-2019-ctnl-addr-leak" "CVE-2020-0429" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_google_bonito.sh "CVE-2020-0067"; commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992"; diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 3c88958e..19a4765c 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -242,7 +242,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index f7596e3a..17bf2ed1 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -117,7 +117,7 @@ buildAll() { #SD865 buildDevice lmi avb; #SD870 - buildDevice alioth avb; + buildDevice alioth avb; #error: Sum of sizes in qti_dynamic_partitions_partition_list is 4561391616, which is greater than qti_dynamic_partitions_size (4559208448) #SD670 buildDevice bonito avb; #error: ln: cannot create symbolic link from '/data/vendor/rfs/mpss' to 'out/target/product/bonito/vendor/rfs/msm/mpss//readwrite': buildDevice sargo avb;