From cf5a58f44770be581fc93e8e36087ccc983a3d98 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 17 Mar 2019 17:27:51 -0400 Subject: [PATCH] 11.0: misc. fixes --- Scripts/Common/Optimize.sh | 9 ++++++--- .../CVE_Patchers/android_kernel_zte_msm8930.sh | 3 ++- Scripts/LineageOS-11.0/Functions.sh | 7 ++++--- Scripts/LineageOS-11.0/Patch.sh | 5 ++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Scripts/Common/Optimize.sh b/Scripts/Common/Optimize.sh index 69bce39e..11792de0 100644 --- a/Scripts/Common/Optimize.sh +++ b/Scripts/Common/Optimize.sh @@ -21,9 +21,12 @@ echo "Optimizing..."; enter "frameworks/base"; -sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java; -sed -i 's/AnimationScale = 1.0f;/AnimationScale = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java; -sed -i 's/DurationnScale = 1.0f;/DurationScale = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java; +sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/java/com/android/server/wm/WindowManagerService.java &>/dev/null || true; +sed -i 's/AnimationScale = 1.0f;/AnimationScale = 0.5f;/' services/java/com/android/server/wm/WindowManagerService.java &>/dev/null || true; +sed -i 's/DurationnScale = 1.0f;/DurationScale = 0.5f;/' services/java/com/android/server/wm/WindowManagerService.java &>/dev/null || true; +sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java &>/dev/null || true; +sed -i 's/AnimationScale = 1.0f;/AnimationScale = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java &>/dev/null || true; +sed -i 's/DurationnScale = 1.0f;/DurationScale = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java &>/dev/null || true; #sed -i 's|||' enter "kernel" diff --git a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh index 99f628b3..7c3f8b96 100644 --- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh +++ b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh @@ -145,11 +145,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p151" +editKernelLocalversion "-dos.p152" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh index d295db85..d33172cb 100644 --- a/Scripts/LineageOS-11.0/Functions.sh +++ b/Scripts/LineageOS-11.0/Functions.sh @@ -58,9 +58,10 @@ patchWorkspace() { sed -i "s/'git', 'show', '-q'/'git', 'show'/" build/tools/repopick.py; #fix for old git versions source build/envsetup.sh; repopick -it asb-2018.09-cm11-qcom; - repopick -it asb-2019.02-cm11; - repopick -it asb-2019.03-cm11; - repopick -it 230054 230392; #asb disclaimer + repopick -it asb-2019.02-cm11; #merged, execpt for level + #repopick -it asb-2019.03-cm11; #libnfc patches failing to apply + repopick -i 243758 244136 244129; #non nfc patches from asb-2019.03-cm11 + repopick -i 230054 230392; #asb disclaimer source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-11.0/Patch.sh b/Scripts/LineageOS-11.0/Patch.sh index be1cdc91..2fd5ef79 100644 --- a/Scripts/LineageOS-11.0/Patch.sh +++ b/Scripts/LineageOS-11.0/Patch.sh @@ -71,7 +71,6 @@ enterAndClear "build"; sed -i 's/Mms/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence sed -i '497i$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/base_rules.mk; sed -i '80iLOCAL_AAPT_FLAGS += --auto-add-overlay' core/package.mk; -sed -i 's/2018-08-01/2019-01-01/' build/core/version_defaults.mk; #XXX: dirty lies! (kinda) enterAndClear "external/sqlite"; patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0) @@ -136,9 +135,9 @@ echo "TARGET_DISPLAY_USE_RETIRE_FENCE := true" >> BoardConfig.mk; sed -i 's/libm libc/libm libc libutils/' charger/Android.mk; sed -i 's/ro.sf.lcd_density=240/ro.sf.lcd_density=180/' system.prop; awk -i inplace '!/WCNSS_qcom_wlan_nv_2.bin/' proprietary-files.txt; #Missing +echo "lib/hw/camera.msm8960.so" >> proprietary-files.txt; #In nex-vendor-blobs.mk -# "system/lib/libtime_genoff.so" -> "obj/lib/libtime_genoff.so" -# Add "camera.msm8960.so" +# Copy "system/lib/libtime_genoff.so" as "obj/lib/libtime_genoff.so" enterAndClear "kernel/zte/msm8930" patch -p1 < "$DOS_PATCHES/android_kernel_zte_msm8930/0001-MDP-Fix.patch";