From 163fdb1f681d887d0efc37e46a729289b43462d4 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 31 May 2019 20:58:18 -0400 Subject: [PATCH] Minor updates --- Patches/Linux | 2 +- PrebuiltApps | 2 +- Scripts/LineageOS-14.1/Functions.sh | 3 ++- Scripts/LineageOS-16.0/Functions.sh | 1 - Scripts/LineageOS-16.0/Patch.sh | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 0cd5f2a9..4a39cd25 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 0cd5f2a99dee44339ed615d413761e4d2bd58238 +Subproject commit 4a39cd25a28c5ca7a102fc29b83696d87f7eae2f diff --git a/PrebuiltApps b/PrebuiltApps index 8a92e6ce..b18ebf42 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 8a92e6ce87bbf904bf86ed77e998c072f8a3de9a +Subproject commit b18ebf42af0132a71256f04189675e8b62ba4537 diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 09c80dc7..81d19a52 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -111,7 +111,8 @@ patchWorkspace() { repopick 242134; #AVRCP off-by-one fix repopick 244387 244388; #loopback fixes repopick -it CVE-2019-2033; - repopick -it n-asb-2019-05; + repopick 248599; #restrict SET_TIME_ZONE permission + repopick 248600 248649; #/proc hardening export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 4e02ba78..1fb813a4 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -64,7 +64,6 @@ patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; source build/envsetup.sh; - repopick 245252; #update webview source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index b6989021..0e5126fa 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -148,11 +148,11 @@ patch -p1 < "$DOS_PATCHES/android_packages_apps_Updater/0002-Tor_Support.patch"; sed -i 's/PROP_BUILD_VERSION_INCREMENTAL);/PROP_BUILD_VERSION_INCREMENTAL).replaceAll("\\\\.", "");/' src/org/lineageos/updater/misc/Utils.java; #Remove periods from incremental version #TODO: Remove changelog -enterAndClear "packages/apps/WallpaperPicker"; +#enterAndClear "packages/apps/WallpaperPicker"; #TODO: Add back wallpapers -sed -i 's/req.touchEnabled = touchEnabled;/req.touchEnabled = true;/' src/com/android/wallpaperpicker/WallpaperCropActivity.java; #Allow scrolling -sed -i 's/mCropView.setTouchEnabled(req.touchEnabled);/mCropView.setTouchEnabled(true);/' src/com/android/wallpaperpicker/WallpaperCropActivity.java; -sed -i 's/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0);/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0.5f);/' src/com/android/wallpaperpicker/WallpaperPickerActivity.java; #Center aligned by default +#sed -i 's/req.touchEnabled = touchEnabled;/req.touchEnabled = true;/' src/com/android/wallpaperpicker/WallpaperCropActivity.java; #Allow scrolling +#sed -i 's/mCropView.setTouchEnabled(req.touchEnabled);/mCropView.setTouchEnabled(true);/' src/com/android/wallpaperpicker/WallpaperCropActivity.java; +#sed -i 's/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0);/WallpaperUtils.EXTRA_WALLPAPER_OFFSET, 0.5f);/' src/com/android/wallpaperpicker/WallpaperPickerActivity.java; #Center aligned by default enterAndClear "packages/inputmethods/LatinIME"; patch -p1 < "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0001-Voice.patch"; #Remove voice input key @@ -200,7 +200,7 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All #START OF DEVICE CHANGES # enterAndClear "device/lge/mako"; -git revert 218f7442874f7b7d494f265286a2151e2f81bb6e 31a1cb251d5e35d8954cec6f373840f14ba96df9; #disable dexpreopt full and switch back to -mini +git revert 218f7442874f7b7d494f265286a2151e2f81bb6e; #disable dexpreopt full and switch back to -mini echo "allow kickstart usbfs:dir search;" >> sepolicy/kickstart.te; #Fix forceencrypt on first boot echo "allow system_server sensors_data_file:dir search;" >> sepolicy/system_server.te; #Fix qcom_sensors log spam echo "allow system_server sensors_data_file:dir r_file_perms;" >> sepolicy/system_server.te;