From 4c2626ffea1f00efe39a69f23df826b3551f6867 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 18 Jul 2017 20:34:46 -0400 Subject: [PATCH] Modified LTE Only option from CopperheadOS --- .../0001-LTE_Only.patch | 157 ++++++++++++++++++ Scripts/Generate_Incrementals.sh | 3 - Scripts/LAOS-14.1_Patches.sh | 5 +- 3 files changed, 161 insertions(+), 4 deletions(-) create mode 100644 Patches/LineageOS-14.1/android_packages_services_Telephony/0001-LTE_Only.patch delete mode 100644 Scripts/Generate_Incrementals.sh diff --git a/Patches/LineageOS-14.1/android_packages_services_Telephony/0001-LTE_Only.patch b/Patches/LineageOS-14.1/android_packages_services_Telephony/0001-LTE_Only.patch new file mode 100644 index 00000000..f992a2b6 --- /dev/null +++ b/Patches/LineageOS-14.1/android_packages_services_Telephony/0001-LTE_Only.patch @@ -0,0 +1,157 @@ +From 9ec96f3f2907396d56df980cc30ad280e25e947e Mon Sep 17 00:00:00 2001 +From: Daniel Micay +Date: Tue, 18 Jul 2017 20:26:10 -0400 +Subject: [PATCH] LTE only option + +Basically a copy of thestinger's implementation in CopperheadOS at a time where the repo was/is still licensed under Apache2 +https://github.com/CopperheadOS/platform_packages_services_Telephony/commit/567b8daca2d5d570e4eeecd548aa03c606ee9c18 + +Change-Id: Iaa5305435cc77479100b44686301140142180c14 +--- + res/values/strings.xml | 16 ++++++++++++++++ + src/com/android/phone/MobileNetworkSettings.java | 8 ++++++-- + 2 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/res/values/strings.xml b/res/values/strings.xml +index 4ec44534..17f2ecb7 100644 +--- a/res/values/strings.xml ++++ b/res/values/strings.xml +@@ -423,6 +423,8 @@ + Preferred network mode: CDMA/EvDo/GSM/WCDMA + + Preferred network mode: LTE ++ ++ Preferred network mode: LTE only + + Preferred network mode: GSM/WCDMA/LTE + +@@ -681,7 +683,9 @@ + Multi-category disabled + + LTE (recommended) ++ LTE only + 4G (recommended) ++ 4G only + 3G + 2G + 1x +@@ -689,14 +693,17 @@ + + + @string/network_lte ++ @string/network_lte_only + @string/network_3G + + ++ @string/network_4G_only + @string/network_4G + @string/network_3G + + + "9" ++ "11" + "0" + + +@@ -718,28 +725,33 @@ + + + @string/network_lte ++ @string/network_lte_only + @string/network_3G + @string/network_2G + + + @string/network_4G ++ @string/network_4G_only + @string/network_3G + @string/network_2G + + + "9" ++ "11" + "0" + "1" + + + + @string/network_lte ++ @string/network_lte_only + @string/network_3G + @string/network_1x + @string/network_global + + + "8" ++ "11" + "4" + "5" + "10" +@@ -756,20 +768,24 @@ + + + @string/network_lte ++ @string/network_lte_only + @string/network_global + + + "8" ++ "11" + "10" + + + + @string/network_lte ++ @string/network_lte_only + @string/network_3G + @string/network_2G + + + "22" ++ "11" + "18" + "1" + +diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java +index 71feff8b..ca975b71 100644 +--- a/src/com/android/phone/MobileNetworkSettings.java ++++ b/src/com/android/phone/MobileNetworkSettings.java +@@ -819,6 +819,7 @@ public class MobileNetworkSettings extends PreferenceActivity + switch (buttonNetworkMode) { + case Phone.NT_MODE_WCDMA_PREF: + case Phone.NT_MODE_GSM_ONLY: ++ case Phone.NT_MODE_LTE_ONLY: + case Phone.NT_MODE_LTE_GSM_WCDMA: + case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA: + case Phone.NT_MODE_CDMA: +@@ -1007,7 +1008,7 @@ public class MobileNetworkSettings extends PreferenceActivity + break; + case Phone.NT_MODE_LTE_ONLY: + mButtonPreferredNetworkMode.setSummary( +- R.string.preferred_network_mode_lte_summary); ++ R.string.preferred_network_mode_lte_only_summary); + break; + case Phone.NT_MODE_LTE_TDSCDMA_GSM: + mButtonPreferredNetworkMode.setSummary( +@@ -1041,7 +1042,7 @@ public class MobileNetworkSettings extends PreferenceActivity + R.string.preferred_network_mode_global_summary); + } else { + mButtonPreferredNetworkMode.setSummary( +- R.string.preferred_network_mode_lte_summary); ++ R.string.preferred_network_mode_lte_only_summary); + } + break; + case Phone.NT_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: +@@ -1108,6 +1109,9 @@ public class MobileNetworkSettings extends PreferenceActivity + break; + } + case Phone.NT_MODE_LTE_ONLY: ++ mButtonEnabledNetworks.setValue( ++ Integer.toString(Phone.NT_MODE_LTE_ONLY)); ++ break; + case Phone.NT_MODE_LTE_WCDMA: + if (!mIsGlobalCdma) { + mButtonEnabledNetworks.setValue( +-- +2.13.3 + diff --git a/Scripts/Generate_Incrementals.sh b/Scripts/Generate_Incrementals.sh deleted file mode 100644 index 7e3c899f..00000000 --- a/Scripts/Generate_Incrementals.sh +++ /dev/null @@ -1,3 +0,0 @@ -base="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/" -builds="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/out/target/product/" -incrementals="/mnt/Drive-1/Development/Other/Android_ROMs/Builds/LineageOS-14.1/user_release-keys/incremental" diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh index 4e0feee1..ef47034b 100755 --- a/Scripts/LAOS-14.1_Patches.sh +++ b/Scripts/LAOS-14.1_Patches.sh @@ -165,6 +165,9 @@ sed -i 's|drawer_search_default">true|drawer_search_default">false|' res/values/ enter "packages/inputmethods/LatinIME" patch -p1 < $patches"android_packages_inputmethods_LatinIME/0001-Voice.patch" #Remove voice input key +enter "packages/services/Telephony" +patch -p1 < $patches"android_packages_services_Telephony/0001-LTE_Only.patch" #LTE only preferred network mode choice #XXX: Only useful on VoLTE devices. TODO: Add override to isEnhanced4gLteModeSettingEnabledByUser() in ImsManager + enter "system/core" cat /tmp/ar/hosts >> rootdir/etc/hosts #Merge in our HOSTS file patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch" #Harden mounts with nodev/noexec/nosuid @@ -180,7 +183,7 @@ cp $patches"android_vendor_cm/sce.mk" config/sce.mk cp $patches"android_vendor_cm/config.xml" overlay/common/vendor/cmsdk/cm/res/res/values/config.xml; #Per app performance profiles sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence -sed -i 's/mka bacon/mka bacon target-files-package dist/' build/envsetup.sh; #Create target-files for incrementals +#sed -i 's/mka bacon/mka bacon target-files-package dist/' build/envsetup.sh; #Create target-files for incrementals enter "vendor/cmsdk" git fetch https://review.lineageos.org/LineageOS/cm_platform_sdk refs/changes/21/148321/14 && git cherry-pick FETCH_HEAD #network traffic