Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-10-04 01:18:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Many changes

Browse source 
- Drop Copperhead patches
- More overlay work
This commit is contained in:
Tad 2018-07-12 22:05:02 -04:00
parent 39740b384f
commit 1dc92478ed
20 changed files with 30 additions and 908 deletions
Download patch file Download diff file Expand all files Collapse all files

159
Patches/LineageOS-14.1/android_packages_services_Telephony/Copperhead/0001-LTE_Only.patch
View file

@ -1,159 +0,0 @@
From 5a0424ac9cc4bf5978694c76fb1c46ed42d7f4f5 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 16 Aug 2017 08:35:43 -0400
Subject: [PATCH] LTE only option
This is a modified version of thestinger's implementation in CopperheadOS from a time when the repo was/is still licensed under Apache2
https://github.com/CopperheadOS/platform_packages_services_Telephony/commit/567b8daca2d5d570e4eeecd548aa03c606ee9c18
Change-Id: I708135604960f83c1f92ed41d0584a3b48a7886a
---
res/values/strings.xml | 16 ++++++++++++++++
src/com/android/phone/MobileNetworkSettings.java | 10 ++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ec44534..bf251f88 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -423,6 +423,8 @@
<string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: CDMA/EvDo/GSM/WCDMA</string>
<!-- Mobile network settings, summary for preferred network mode LTE [CHAR LIMIT=100] -->
<string name="preferred_network_mode_lte_summary">Preferred network mode: LTE </string>
+ <!-- Mobile network settings, summary for preferred network mode LTE only [CHAR LIMIT=100] -->
+ <string name="preferred_network_mode_lte_only_summary">Preferred network mode: LTE only</string>
<!-- Mobile network settings, summary for preferred network mode GSM/WCDMA/LTE [CHAR LIMIT=100] -->
<string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>
<!-- Mobile network settings, summary for preferred network mode CDMA+LTE/EVDO[CHAR LIMIT=100] -->
@@ -681,7 +683,9 @@
<string name="multi_category_disable">Multi-category disabled</string>
<string name="network_lte">LTE (recommended)</string>
+ <string name="network_lte_only">LTE only</string>
<string name="network_4G">4G (recommended)</string>
+ <string name="network_4G_only">4G only</string>
<string name="network_3G" translatable="false">3G</string>
<string name="network_2G" translatable="false">2G</string>
<string name="network_1x" translatable="false">1x</string>
@@ -689,14 +693,17 @@
<string-array name="enabled_networks_except_gsm_choices" translatable="false">
<item>@string/network_lte</item>
+ <item>@string/network_lte_only</item>
<item>@string/network_3G</item>
</string-array>
<string-array name="enabled_networks_except_gsm_4g_choices" translatable="false">
<item>@string/network_4G</item>
+ <item>@string/network_4G_only</item>
<item>@string/network_3G</item>
</string-array>
<string-array name="enabled_networks_except_gsm_values" translatable="false">
<item>"9"</item>
+ <item>"11"</item>
<item>"0"</item>
</string-array>
@@ -718,28 +725,33 @@
<string-array name="enabled_networks_choices" translatable="false">
<item>@string/network_lte</item>
+ <item>@string/network_lte_only</item>
<item>@string/network_3G</item>
<item>@string/network_2G</item>
</string-array>
<string-array name="enabled_networks_4g_choices" translatable="false">
<item>@string/network_4G</item>
+ <item>@string/network_4G_only</item>
<item>@string/network_3G</item>
<item>@string/network_2G</item>
</string-array>
<string-array name="enabled_networks_values" translatable="false">
<item>"9"</item>
+ <item>"11"</item>
<item>"0"</item>
<item>"1"</item>
</string-array>
<string-array name="enabled_networks_cdma_choices" translatable="false">
<item>@string/network_lte</item>
+ <item>@string/network_lte_only</item>
<item>@string/network_3G</item>
<item>@string/network_1x</item>
<item>@string/network_global</item>
</string-array>
<string-array name="enabled_networks_cdma_values" translatable="false">
<item>"8"</item>
+ <item>"11"</item>
<item>"4"</item>
<item>"5"</item>
<item>"10"</item>
@@ -756,20 +768,24 @@
<string-array name="enabled_networks_cdma_only_lte_choices" translatable="false">
<item>@string/network_lte</item>
+ <item>@string/network_lte_only</item>
<item>@string/network_global</item>
</string-array>
<string-array name="enabled_networks_cdma_only_lte_values" translatable="false">
<item>"8"</item>
+ <item>"11"</item>
<item>"10"</item>
</string-array>
<string-array name="enabled_networks_tdscdma_choices" translatable="false">
<item>@string/network_lte</item>
+ <item>@string/network_lte_only</item>
<item>@string/network_3G</item>
<item>@string/network_2G</item>
</string-array>
<string-array name="enabled_networks_tdscdma_values" translatable="false">
<item>"22"</item>
+ <item>"11"</item>
<item>"18"</item>
<item>"1"</item>
</string-array>
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 71feff8b..2a68c99a 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(
@@ -1107,7 +1108,6 @@ public class MobileNetworkSettings extends PreferenceActivity
controlGsmOptions(true);
break;
}
- case Phone.NT_MODE_LTE_ONLY:
case Phone.NT_MODE_LTE_WCDMA:
if (!mIsGlobalCdma) {
mButtonEnabledNetworks.setValue(
@@ -1120,6 +1120,12 @@ public class MobileNetworkSettings extends PreferenceActivity
mButtonEnabledNetworks.setSummary(R.string.network_global);
}
break;
+ case Phone.NT_MODE_LTE_ONLY:
+ mButtonEnabledNetworks.setValue(
+ Integer.toString(Phone.NT_MODE_LTE_ONLY));
+ mButtonEnabledNetworks.setSummary((mShow4GForLTE == true)
+ ? R.string.network_4G_only : R.string.network_lte_only);
+ break;
case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
if (isWorldMode()) {
mButtonEnabledNetworks.setSummary(
--
2.14.1

28
Patches/LineageOS-14.1/android_system_keymaster/0001-Backport_Fixes.patch
View file

@ -1,28 +0,0 @@
diff --git a/keymaster_configuration.cpp b/keymaster_configuration.cpp
index 428197c..42df7d6 100644
--- a/keymaster_configuration.cpp
+++ b/keymaster_configuration.cpp
@@ -89,7 +89,10 @@
}
regmatch_t matches[kPlatformVersionMatchCount];
- if (regexec(&regex, version_str, kPlatformVersionMatchCount, matches, 0 /* flags */)) {
+ int not_match
+ = regexec(&regex, version_str, kPlatformVersionMatchCount, matches, 0 /* flags */);
+ regfree(&regex);
+ if (not_match) {
ALOGI("Platform version string does not match expected format. Using version 0.");
return 0;
}
@@ -109,7 +112,10 @@
}
regmatch_t matches[kPlatformPatchlevelMatchCount];
- if (regexec(&regex, patchlevel_str, kPlatformPatchlevelMatchCount, matches, 0 /* flags */)) {
+ int not_match
+ = regexec(&regex, patchlevel_str, kPlatformPatchlevelMatchCount, matches, 0 /* flags */);
+ regfree(&regex);
+ if (not_match) {
ALOGI("Platform patchlevel string does not match expected format. Using patchlevel 0");
return 0;
}

96
Patches/LineageOS-14.1/android_system_keymaster/0002-Backport_Fixes.patch
View file

@ -1,96 +0,0 @@
diff --git a/include/keymaster/keymaster_configuration.h b/include/keymaster/keymaster_configuration.h
index 97b7fa5..69738fd 100644
--- a/include/keymaster/keymaster_configuration.h
+++ b/include/keymaster/keymaster_configuration.h
@@ -40,12 +40,24 @@
uint32_t GetOsVersion(const char* version_string);
/**
+ * Retrieves and parses OS version information from build properties. Returns 0 if the string
+ * doesn't contain a numeric version number.
+ */
+uint32_t GetOsVersion();
+
+/**
* Parses OS patch level string, returning year and month in integer form. For example, "2016-03-25"
* will be returned as 201603. Returns 0 if the string doesn't contain a date in the form
* YYYY-MM-DD.
*/
uint32_t GetOsPatchlevel(const char* patchlevel_string);
+/**
+ * Retrieves and parses OS patch level from build properties. Returns 0 if the string doesn't
+ * contain a date in the form YYYY-MM-DD.
+ */
+uint32_t GetOsPatchlevel();
+
} // namespace keymaster
#endif // SYSTEM_KEYMASTER_KEYMASTER_CONFIGURATION_H_
diff --git a/keymaster_configuration.cpp b/keymaster_configuration.cpp
index 42df7d6..ac6d3c1 100644
--- a/keymaster_configuration.cpp
+++ b/keymaster_configuration.cpp
@@ -70,15 +70,7 @@
}
keymaster_error_t ConfigureDevice(keymaster2_device_t* dev) {
- char version_str[PROPERTY_VALUE_MAX];
- property_get(kPlatformVersionProp, version_str, "" /* default */);
- uint32_t version = GetOsVersion(version_str);
-
- char patchlevel_str[PROPERTY_VALUE_MAX];
- property_get(kPlatformPatchlevelProp, patchlevel_str, "" /* default */);
- uint32_t patchlevel = GetOsPatchlevel(patchlevel_str);
-
- return ConfigureDevice(dev, version, patchlevel);
+ return ConfigureDevice(dev, GetOsVersion(), GetOsPatchlevel());
}
uint32_t GetOsVersion(const char* version_str) {
@@ -89,8 +81,8 @@
}
regmatch_t matches[kPlatformVersionMatchCount];
- int not_match
- = regexec(&regex, version_str, kPlatformVersionMatchCount, matches, 0 /* flags */);
+ int not_match =
+ regexec(&regex, version_str, kPlatformVersionMatchCount, matches, 0 /* flags */);
regfree(&regex);
if (not_match) {
ALOGI("Platform version string does not match expected format. Using version 0.");
@@ -104,6 +96,12 @@
return (major * 100 + minor) * 100 + subminor;
}
+uint32_t GetOsVersion() {
+ char version_str[PROPERTY_VALUE_MAX];
+ property_get(kPlatformVersionProp, version_str, "" /* default */);
+ return GetOsVersion(version_str);
+}
+
uint32_t GetOsPatchlevel(const char* patchlevel_str) {
regex_t regex;
if (regcomp(&regex, kPlatformPatchlevelRegex, REG_EXTENDED) != 0) {
@@ -112,8 +110,8 @@
}
regmatch_t matches[kPlatformPatchlevelMatchCount];
- int not_match
- = regexec(&regex, patchlevel_str, kPlatformPatchlevelMatchCount, matches, 0 /* flags */);
+ int not_match =
+ regexec(&regex, patchlevel_str, kPlatformPatchlevelMatchCount, matches, 0 /* flags */);
regfree(&regex);
if (not_match) {
ALOGI("Platform patchlevel string does not match expected format. Using patchlevel 0");
@@ -130,4 +128,10 @@
return year * 100 + month;
}
+uint32_t GetOsPatchlevel() {
+ char patchlevel_str[PROPERTY_VALUE_MAX];
+ property_get(kPlatformPatchlevelProp, patchlevel_str, "" /* default */);
+ return GetOsPatchlevel(patchlevel_str);
+}
+
} // namespace keymaster