11.0: More work

2024-10-01 01:35:54 -04:00 · 2018-07-10 08:07:19 -04:00 · 2018-07-10 08:07:19 -04:00 · 5716c58485
commit 5716c58485
parent 05a5c7c38c
7 changed files with 149 additions and 33 deletions
--- a/Patches/LineageOS-11.0/android_device_zte_nex/0002-Lower_DPI.patch
+++ b/Patches/LineageOS-11.0/android_device_zte_nex/0002-Lower_DPI.patch
@ -1,25 +0,0 @@
-From fc786df1d3a1f6012863f042f34b2bc0b9a0bd2f Mon Sep 17 00:00:00 2001
-From: Tad <tad@spotco.us>
-Date: Sun, 11 Dec 2016 23:23:58 -0500
-Subject: [PATCH] Change DPI
-
-Change-Id: Ia9059e0b554fec09ab73f961b09cf6316aeaa9c9
---
- system.prop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/system.prop b/system.prop
-index 4f7a90c..9cdb394 100644
--- a/system.prop
-+++ b/system.prop
-@@ -27,7 +27,7 @@ DEVICE_PROVISIONED=1
- debug.sf.hw=1
- debug.egl.hw=1
- debug.composition.type=gpu
-ro.sf.lcd_density=240
-+ro.sf.lcd_density=180
- dalvik.vm.heapsize=36m
- debug.enable.wl_log=1
- debug.mdpcomp.maxlayer=4
-- 
-2.9.3
--- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh
+++ b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh
@ -31,7 +31,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1593/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1805/3.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2041/^3.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2686/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2922/ANY/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2922/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-3636/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7550/^4.3/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8215/ANY/0001.patch
--- a/Scripts/LineageOS-11.0/Defaults.sh
+++ b/Scripts/LineageOS-11.0/Defaults.sh
@ -0,0 +1,59 @@
+#!/bin/bash
+#DivestOS: A privacy oriented Android distribution
+#Copyright (c) 2017-2018 Divested Computing, Inc.
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 3 of the License, or
+#(at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#Changes various default settings
+#Last verified: 2018-07-10
+
+#Useful commands
+#nano $(find . -name "config.xml" | grep "values/" | grep -v "device" | grep -v "tests")
+#nano $(find . -name "defaults.xml" | grep "values/" | grep -v "device")
+
+echo "Changing default settings...";
+
+enter "frameworks/base";
+sed -i 's/def_lockscreen_sounds_enabled">1/def_lockscreen_sounds_enabled">0/' packages/SettingsProvider/res/values/defaults.xml;
+sed -i 's/def_networks_available_notification_on">true/def_networks_available_notification_on">false/' packages/SettingsProvider/res/values/defaults.xml;
+sed -i 's/def_sound_effects_enabled">true/def_sound_effects_enabled">false/' packages/SettingsProvider/res/values/defaults.xml;
+sed -i 's/_animation_scale">100%/_animation_scale">50%/' packages/SettingsProvider/res/values/defaults.xml;
+
+enter "packages/apps/Dialer";
+sed -i 's/ENABLE_FORWARD_LOOKUP, 1)/ENABLE_FORWARD_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java; #Disable FLP
+sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java; #Disable PLP
+sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java; #Disable RLP
+
+enter "packages/apps/FDroid";
+sed -i '/string\/show_root_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml;
+sed -i '/string\/show_anti_feature_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml;
+
+enter "packages/apps/Nfc";
+sed -i 's/boolean NFC_ON_DEFAULT = true;/boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
+sed -i 's/boolean NDEF_PUSH_ON_DEFAULT = true;/boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push
+
+enter "packages/apps/Settings";
+sed -i 's/Float.parseFloat(newValue.toString()) : 1;/Float.parseFloat(newValue.toString()) : 0.5f;/' src/com/android/settings/DevelopmentSettings.java; #Always reset animation scales to 0.5
+
+enter "packages/apps/Trebuchet";
+sed -i 's|homescreen_search_default">true|homescreen_search_default">false|' res/values/preferences_defaults.xml; #Disable search
+
+enter "vendor/cm";
+sed -i 's/ro.config.notification_sound=Argon.ogg/ro.config.notification_sound=Pong.ogg/' config/common*.mk;
+sed -i 's/ro.config.alarm_alert=Hassium.ogg/ro.config.alarm_alert=Alarm_Buzzer.ogg/' config/common*.mk;
+awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml;
+sed -i 's|config_mms_user_agent">LineageOS|config_mms_user_agent">Android-Mms/2.0|' overlay/common/frameworks/base/core/res/res/values/config.xml;
+
+cd "$DOS_BUILD_BASE";
+echo "Default settings changed!";
--- a/Scripts/LineageOS-11.0/Functions.sh
+++ b/Scripts/LineageOS-11.0/Functions.sh
@ -15,7 +15,7 @@
 #You should have received a copy of the GNU General Public License
 #along with this program.  If not, see <https://www.gnu.org/licenses/>.

-#Last verified: 2018-04-27
+#Last verified: 2018-07-10

 patchAllKernels() {
 	startPatcher "kernel_asus_grouper kernel_zte_msm8930";
@ -59,11 +59,10 @@ patchWorkspace() {
 	#source build/envsetup.sh;

 	source "$DOS_SCRIPTS/Patch.sh";
-	#source "$DOS_SCRIPTS/Defaults.sh";
+	source "$DOS_SCRIPTS/Defaults.sh";
 	#if [ "$DOS_OVERCLOCKS_ENABLED" = true ]; then source "$DOS_SCRIPTS/Overclock.sh"; fi;
-	#source "$DOS_SCRIPTS/Optimize.sh";
-	#source "$DOS_SCRIPTS/Rebrand.sh";
-	#source "$DOS_SCRIPTS/Theme.sh";
+	source "$DOS_SCRIPTS/Optimize.sh";
+	source "$DOS_SCRIPTS/Rebrand.sh";
 	source "$DOS_SCRIPTS_COMMON/Deblob.sh";
 	source "$DOS_SCRIPTS_COMMON/Patch_CVE.sh";
 	source build/envsetup.sh;
--- a/Scripts/LineageOS-11.0/Optimize.sh
+++ b/Scripts/LineageOS-11.0/Optimize.sh
@ -0,0 +1,32 @@
+#!/bin/bash
+#DivestOS: A privacy oriented Android distribution
+#Copyright (c) 2017-2018 Divested Computing, Inc.
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 3 of the License, or
+#(at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#Attempts to increase performance and battery life
+#Last verified: 2018-07-10
+
+echo "Optimizing...";
+
+enter "frameworks/base";
+sed -i 's|config_useVolumeKeySounds">true|config_useVolumeKeySounds">false|' core/res/res/values/config.xml;
+sed -i 's|config_wifi_supplicant_scan_interval">15000|config_wifi_supplicant_scan_interval">30000|' core/res/res/values/config.xml;
+#sed -i 's|||'
+
+enter "kernel"
+sed -i "s/#define VM_MAX_READAHEAD\t128/#define VM_MAX_READAHEAD\t512/" ./*/*/include/linux/mm.h; #Lee Susman <lsusman@codeaurora.org>: Change the VM_MAX_READAHEAD value from the default 128KB to 512KB. This will allow the readahead window to grow to a maximum size of 512KB, which greatly benefits to sequential read throughput.
+
+cd "$DOS_BUILD_BASE";
+echo "Optimizing complete!";
--- a/Scripts/LineageOS-11.0/Patch.sh
+++ b/Scripts/LineageOS-11.0/Patch.sh
@ -15,7 +15,7 @@
 #You should have received a copy of the GNU General Public License
 #along with this program.  If not, see <https://www.gnu.org/licenses/>.

-#Last verified:
+#Last verified: 2018-07-10

 #Initialize aliases
 #source ../../Scripts/init.sh
@ -131,6 +131,7 @@ if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/h
 #patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden_Mounts.patch"; #Harden mounts with nodev/noexec/nosuid (CopperheadOS-13.0) #TODO

 enterAndClear "vendor/cm";
+rm -rf terminal;
 awk -i inplace '!/50-cm.sh/' config/common.mk; #Make sure our hosts is always used
 #sed -i '3iinclude vendor/cm/config/sce.mk' config/common.mk; #Include extra apps #TODO
 if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
@ -155,7 +156,7 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/CM_BUILDTYPE :=

 enterAndClear "device/zte/nex"
 patch -p1 < "$DOS_PATCHES/android_device_zte_nex/0001-Fixes.patch"; #Build fixes
-patch -p1 < "$DOS_PATCHES/android_device_zte_nex/0002-Lower_DPI.patch";
+sed -i 's/ro.sf.lcd_density=240/ro.sf.lcd_density=180/' system.prop;
 mv cm.mk lineage.mk;
 sed -i 's/cm_/lineage_/' lineage.mk vendorsetup.sh;
 #In nex-vendor-blobs.mk
--- a/Scripts/LineageOS-11.0/Rebrand.sh
+++ b/Scripts/LineageOS-11.0/Rebrand.sh
@ -0,0 +1,50 @@
+#!/bin/bash
+#DivestOS: A privacy oriented Android distribution
+#Copyright (c) 2017-2018 Divested Computing, Inc.
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 3 of the License, or
+#(at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#Updates select user facing strings
+#Last verified: 2018-04-27
+
+echo "Rebranding...";
+
+enter "bootable/recovery-cm";
+sed -i 's|CyanogenMod Simple Recovery|'"$DOS_BRANDING_NAME"' Recovery|' ./recovery.cpp;
+
+enter "build";
+sed -i 's|echo "ro.build.user=$USER"|echo "ro.build.user=emy"|' tools/buildinfo.sh; #Override build user
+sed -i 's|echo "ro.build.host=`hostname`"|echo "ro.build.host=dosbm"|' tools/buildinfo.sh; #Override build host
+sed -i '/CM_TARGET_PACKAGE/s/lineage/'"$DOS_BRANDING_ZIP_PREFIX"'/' core/Makefile;
+
+enter "frameworks/base";
+generateBootAnimationMask "$DOS_BRANDING_NAME" "$DOS_BRANDING_BOOTANIMATION_FONT" core/res/assets/images/android-logo-mask.png;
+generateBootAnimationShine "$DOS_BRANDING_BOOTANIMATION_COLOR" "$DOS_BRANDING_BOOTANIMATION_STYLE" core/res/assets/images/android-logo-shine.png;
+
+enter "packages/apps/Settings";
+sed -i '/.*cmlicense_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/cm_strings.xml
+sed -i '/.*cmlicense_activity_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/cm_strings.xml
+sed -i '/.*cmupdate_settings_title/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/cm_strings.xml
+sed -i '/.*mod_version/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/cm_strings.xml
+sed -i '/.*privacy_settings_cyanogenmod_category/s/LineageOS/'"$DOS_BRANDING_NAME"'/' res/values*/cm_strings.xml
+
+enter "packages/apps/CMUpdater";
+sed -i 's|https://download.cyanogenmod.org/api|'"$DOS_BRANDING_SERVER_OTA"'|' res/values/config.xml;
+
+enter "vendor/cm";
+sed -i 's|https://lineageos.org/legal|'"$DOS_BRANDING_LINK_ABOUT"'|' config/common.mk;
+rm -rf bootanimation;
+
+cd "$DOS_BUILD_BASE";
+echo "Rebranding complete!";