From 4011255c5379af9a9248e364e33065e188317a7e Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 25 Apr 2018 22:28:42 -0400 Subject: [PATCH] 14.1: Fixes --- Misc/Defaults_to_Change.txt | 45 +++++++++++++++++++ .../android_kernel_fairphone_msm8974.sh | 5 +-- Scripts/LineageOS-14.1/Patch.sh | 4 +- Scripts/LineageOS-15.1/Defaults.sh | 4 +- 4 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 Misc/Defaults_to_Change.txt diff --git a/Misc/Defaults_to_Change.txt b/Misc/Defaults_to_Change.txt new file mode 100644 index 00000000..6dae0bd4 --- /dev/null +++ b/Misc/Defaults_to_Change.txt @@ -0,0 +1,45 @@ +secure + camera_double_tap_power_gesture_disabled=1 + lock_screen_allow_private_notifications=0 + lock_screen_lock_after_timeout=30000 + lock_screen_show_notifications=1 + screensaver_enabled=0 + +secure --lineage + power_menu_actions=power|restart|screenshot|users|lockdown + privacy_guard_default=1 + privacy_guard_notification=0 + stats_collection=1 + +global + network_recommendations_enabled=0 + package_verifier_enable=1 + power_sounds_enabled=0 + require_password_to_decrypt=1 + +system + accelerometer_rotation=0 + lockscreen_sounds_enabled=0 + screen_off_timeout=30000 + show_password=0 + sound_effects_enabled=0 + transition_animation_scale=1.0 + user_rotation=0 + vibrate_when_ringing=1 + window_animation_scale=1.0 + notification_sound=content://media/internal/audio/media/82 + alarm_alert=content://media/internal/audio/media/8 + ringtone=content://media/internal/audio/media/133 + +system --lineage + camera_launch=0 + double_tap_sleep_gesture=0 + enable_forward_lookup=0 + enable_people_lookup=0 + enable_reverse_lookup=0 + key_home_double_tap_action=8 + key_home_long_press_action=3 + torch_long_press_power_gesture=1 + torch_long_press_power_timeout=120 + volbtn_music_controls=0 + volume_keys_control_ring_stream=0 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 8f231958..c1dfa393 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -2,6 +2,7 @@ cd $base"kernel/fairphone/msm8974" git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/ANY/0001.patch git apply $cvePatchesLinux/0010-Accelerated_AES/3.4/0002.patch +git apply $cvePatchesLinux/0012-Copperhead-Deny_USB/3.4/3.4-Backport.patch git apply $cvePatchesLinux/CVE-2014-3153/ANY/0002.patch git apply $cvePatchesLinux/CVE-2014-3153/ANY/0004.patch git apply $cvePatchesLinux/CVE-2016-0774/ANY/0001.patch @@ -16,8 +17,6 @@ git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0003.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0004.patch -git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch @@ -30,5 +29,5 @@ git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p30" +editKernelLocalversion "-dos.p29" cd $base diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index a5ab8336..2d8930ae 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -62,7 +62,7 @@ enterAndClear "bootable/recovery"; patch -p1 < $patches"android_bootable_recovery/0001-Squash_Menus.patch"; #What's a back button? enterAndClear "build"; -patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing (CopperheadOS-13.0) +patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch"; #Automated build signing (CopperheadOS-13.0) sed -i 's/messaging/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence enterAndClear "device/qcom/sepolicy"; @@ -159,7 +159,7 @@ enterAndClear "packages/services/Telephony"; if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then patch -p1 < $patches"android_packages_services_Telephony/Copperhead/0001-LTE_Only.patch"; fi; #LTE only preferred network mode choice (Copperhead CC BY-NC-SA) enterAndClear "system/core"; -then cat /tmp/ar/hosts >> rootdir/etc/hosts; #Merge in our HOSTS file +cat /tmp/ar/hosts >> rootdir/etc/hosts; #Merge in our HOSTS file git revert 0217dddeb5c16903c13ff6c75213619b79ea622b d7aa1231b6a0631f506c0c23816f2cd81645b15f; #Always update recovery XXX: This doesn't seem to work patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch"; #Harden mounts with nodev/noexec/nosuid (CopperheadOS-13.0) diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh index c4164ca6..0055efe8 100644 --- a/Scripts/LineageOS-15.1/Defaults.sh +++ b/Scripts/LineageOS-15.1/Defaults.sh @@ -21,8 +21,8 @@ echo "Changing default settings..."; enter "frameworks/base"; sed -i '0,/wifi,bt,dnd,flashlight/s/wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast/wifi,cell,bt,dnd,flashlight,rotation,battery,sync,location,airplane,saver,hotspot,nfc/' packages/SystemUI/res/values/config.xml; #Default quick tiles -#sed -i 's|config_longPressOnHomeBehavior">2|config_longPressOnHomeBehavior">0|' core/res/res/values/config.xml; #Set long press home to do nothing -#sed -i 's|config_doubleTapOnHomeBehavior">0|config_doubleTapOnHomeBehavior">8|' core/res/res/values/config.xml; #Set double tap home to switch to last app +sed -i 's|config_longPressOnHomeBehavior">2|config_longPressOnHomeBehavior">3|' core/res/res/values/config.xml; #Set long press home to open search assistant +sed -i 's|config_doubleTapOnHomeBehavior">0|config_doubleTapOnHomeBehavior">8|' core/res/res/values/config.xml; #Set double tap home to switch to last app enter "packages/apps/Dialer"; sed -i 's/LineageSettings.System.ENABLE_FORWARD_LOOKUP, 1)/LineageSettings.System.ENABLE_FORWARD_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable FLP