diff --git a/Patches/LineageOS-20.0/android_external_webp/CVE-2023-4863.patch b/Patches/LineageOS-20.0/android_external_webp/CVE-2023-4863.patch index eefb4042..d46c417a 100644 --- a/Patches/LineageOS-20.0/android_external_webp/CVE-2023-4863.patch +++ b/Patches/LineageOS-20.0/android_external_webp/CVE-2023-4863.patch @@ -1,4 +1,4 @@ -From 801d2be12dba966233c21f850490203eb1acf014 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Thu, 7 Sep 2023 21:16:03 +0200 Subject: [PATCH] Fix OOB write in BuildHuffmanTable. @@ -21,7 +21,7 @@ Change-Id: I31c36dbf3aa78d35ecf38706b50464fd3d375741 4 files changed, 129 insertions(+), 43 deletions(-) diff --git a/src/dec/vp8l_dec.c b/src/dec/vp8l_dec.c -index 78db014030..2461b07f99 100644 +index 78db0140..2461b07f 100644 --- a/src/dec/vp8l_dec.c +++ b/src/dec/vp8l_dec.c @@ -253,11 +253,11 @@ static int ReadHuffmanCodeLengths( @@ -169,7 +169,7 @@ index 78db014030..2461b07f99 100644 assert(dec->hdr_.num_htree_groups_ > 0); diff --git a/src/dec/vp8li_dec.h b/src/dec/vp8li_dec.h -index 72b2e86120..32540a4b88 100644 +index 72b2e861..32540a4b 100644 --- a/src/dec/vp8li_dec.h +++ b/src/dec/vp8li_dec.h @@ -51,7 +51,7 @@ typedef struct { @@ -182,7 +182,7 @@ index 72b2e86120..32540a4b88 100644 typedef struct VP8LDecoder VP8LDecoder; diff --git a/src/utils/huffman_utils.c b/src/utils/huffman_utils.c -index 0cba0fbb7d..9efd6283ac 100644 +index 0cba0fbb..9efd6283 100644 --- a/src/utils/huffman_utils.c +++ b/src/utils/huffman_utils.c @@ -177,21 +177,24 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits, @@ -313,7 +313,7 @@ index 0cba0fbb7d..9efd6283ac 100644 + } +} diff --git a/src/utils/huffman_utils.h b/src/utils/huffman_utils.h -index 13b7ad1ac4..98415c5328 100644 +index 13b7ad1a..98415c53 100644 --- a/src/utils/huffman_utils.h +++ b/src/utils/huffman_utils.h @@ -43,6 +43,29 @@ typedef struct { diff --git a/Patches/LineageOS-20.0/android_packages_inputmethods_LatinIME/0001-Voice.patch b/Patches/LineageOS-20.0/android_packages_inputmethods_LatinIME/0001-Voice.patch index 32691ff3..55f13fee 100644 --- a/Patches/LineageOS-20.0/android_packages_inputmethods_LatinIME/0001-Voice.patch +++ b/Patches/LineageOS-20.0/android_packages_inputmethods_LatinIME/0001-Voice.patch @@ -1,15 +1,15 @@ -From 0b916be981f926661c9e24d5ab8ded29bc9be7e2 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 29 May 2017 20:25:28 -0400 Subject: [PATCH] Remove voice input key Change-Id: Ifb56c679d3a9b6c035fcdd4596ec0b3b5653bea8 --- - java/res/values-sw430dp/config-per-form-factor.xml | 2 +- - java/res/values/config-per-form-factor.xml | 2 +- - java/res/xml/prefs_screen_preferences.xml | 2 +- - .../inputmethod/latin/settings/PreferencesSettingsFragment.java | 3 +-- - java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 6 ++---- + java/res/values-sw430dp/config-per-form-factor.xml | 2 +- + java/res/values/config-per-form-factor.xml | 2 +- + java/res/xml/prefs_screen_preferences.xml | 2 +- + .../latin/settings/PreferencesSettingsFragment.java | 3 +-- + .../android/inputmethod/latin/settings/SettingsValues.java | 6 ++---- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/java/res/values-sw430dp/config-per-form-factor.xml b/java/res/values-sw430dp/config-per-form-factor.xml @@ -39,10 +39,10 @@ index 67fc75134..1bbf1640e 100644 diff --git a/java/res/xml/prefs_screen_preferences.xml b/java/res/xml/prefs_screen_preferences.xml -index 101edc855..540f9f6a6 100644 +index d2dc51e7f..c7f8b588b 100644 --- a/java/res/xml/prefs_screen_preferences.xml +++ b/java/res/xml/prefs_screen_preferences.xml -@@ -48,6 +48,6 @@ +@@ -66,6 +66,6 @@ Date: Thu, 14 Sep 2017 00:03:16 -0400 Subject: [PATCH] disable personalized dicts by default diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 2ac9ac1f..4d7a3591 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -513,10 +513,6 @@ if enterAndClear "kernel/fairphone/sdm632"; then sed -i 's|/../../prebuilts/tools-lineage|/../../../prebuilts/tools-lineage|' lib/Makefile; #fixup typo fi; -if enterAndClear "kernel/oneplus/sm8150"; then -rm Android.bp; -fi; - if enterAndClear "kernel/oneplus/sm7250"; then git revert --no-edit 6eede8c64f268991abe669a6123e929e295fac29; fi;