Switch DNS back to OpenNIC for now

Misc/Features/Lock_Screen_Timeouts.txt

@@ -0,0 +1,3 @@
+        if (failedAttempts >= 12 && timeoutMs < (failedAttempts * 600000)) {
+            timeoutMs = (failedAttempts * 600000);
+        }

Patches/LineageOS-14.1/android_frameworks_base/0006-DNS_OpenNIC.patch

@@ -0,0 +1,76 @@
+From 813078cefb7e87cdc42f0323f6ef7e05deb74545 Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Tue, 8 May 2018 16:02:24 -0400
+Subject: [PATCH] Change fallback, tethering, and test DNS servers to OpenNIC
+
+Change-Id: Ic827c6d1baab6c86bf1f6e4125a4e324d0f5890f
+---
+ core/res/res/values/config.xml                                | 2 +-
+ packages/SettingsLib/res/values/strings.xml                   | 4 ++--
+ .../com/android/server/connectivity/NetworkDiagnostics.java   | 4 ++--
+ .../core/java/com/android/server/connectivity/Tethering.java  | 4 ++--
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
+index c29ff3c90a9..fa747cb651f 100755
+--- a/core/res/res/values/config.xml
++++ b/core/res/res/values/config.xml
+@@ -1608,7 +1608,7 @@
+     <bool name="config_bluetooth_default_profiles">true</bool>
+ 
+     <!-- IP address of the dns server to use if nobody else suggests one -->
+-    <string name="config_default_dns_server" translatable="false">8.8.8.8</string>
++    <string name="config_default_dns_server" translatable="false">169.239.202.202</string>
+ 
+     <!-- The default mobile provisioning apn. Empty by default, maybe overridden by
+          an mcc/mnc specific config.xml -->
+diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
+index f9bd24ba69f..58ae0701f20 100644
+--- a/packages/SettingsLib/res/values/strings.xml
++++ b/packages/SettingsLib/res/values/strings.xml
+@@ -837,9 +837,9 @@
+     <!-- Hint text for the IP address -->
+     <string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string>
+     <!-- Hint text for DNS -->
+-    <string name="wifi_dns1_hint" translatable="false">8.8.8.8</string>
++    <string name="wifi_dns1_hint" translatable="false">169.239.202.202</string>
+     <!-- Hint text for DNS -->
+-    <string name="wifi_dns2_hint" translatable="false">8.8.4.4</string>
++    <string name="wifi_dns2_hint" translatable="false">185.121.177.177</string>
+     <!-- Hint text for the gateway -->
+     <string name="wifi_gateway_hint" translatable="false">192.168.1.1</string>
+     <!-- Hint text for network prefix length -->
+diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
+index 5f9efe704f7..ac3068a07c2 100644
+--- a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
++++ b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
+@@ -84,9 +84,9 @@ import libcore.io.IoUtils;
+ public class NetworkDiagnostics {
+     private static final String TAG = "NetworkDiagnostics";
+ 
+-    private static final InetAddress TEST_DNS4 = NetworkUtils.numericToInetAddress("8.8.8.8");
++    private static final InetAddress TEST_DNS4 = NetworkUtils.numericToInetAddress("169.239.202.202");
+     private static final InetAddress TEST_DNS6 = NetworkUtils.numericToInetAddress(
+-            "2001:4860:4860::8888");
++            "2a05:dfc7:5353::53");
+ 
+     // For brevity elsewhere.
+     private static final long now() {
+diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
+index f0cf0d98882..8c8489a6ee3 100644
+--- a/services/core/java/com/android/server/connectivity/Tethering.java
++++ b/services/core/java/com/android/server/connectivity/Tethering.java
+@@ -181,8 +181,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
+     };
+ 
+     private String[] mDefaultDnsServers;
+-    private static final String DNS_DEFAULT_SERVER1 = "8.8.8.8";
+-    private static final String DNS_DEFAULT_SERVER2 = "8.8.4.4";
++    private static final String DNS_DEFAULT_SERVER1 = "169.239.202.202";
++    private static final String DNS_DEFAULT_SERVER2 = "185.121.177.177";
+ 
+     private final StateMachine mTetherMasterSM;
+     private final UpstreamNetworkMonitor mUpstreamNetworkMonitor;
+-- 
+2.17.0
+

Patches/LineageOS-15.1/android_frameworks_base/0004-DNS_OpenNIC.patch

@@ -0,0 +1,74 @@
+From c5e9c3afd27e8b9672c0a0395f34084b1322dd61 Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Tue, 8 May 2018 15:53:53 -0400
+Subject: [PATCH] Change fallback, tethering, and test DNS servers to OpenNIC
+
+Change-Id: Ic828a5695aa24a12ba8921115cb87eec7dc7ad30
+---
+ core/res/res/values/config.xml                                | 2 +-
+ packages/SettingsLib/res/values/strings.xml                   | 4 ++--
+ .../com/android/server/connectivity/NetworkDiagnostics.java   | 4 ++--
+ .../server/connectivity/tethering/TetheringConfiguration.java | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
+index 3ce8959a983..cd7602763a1 100644
+--- a/core/res/res/values/config.xml
++++ b/core/res/res/values/config.xml
+@@ -1651,7 +1651,7 @@
+     <bool name="config_bluetooth_default_profiles">true</bool>
+ 
+     <!-- IP address of the dns server to use if nobody else suggests one -->
+-    <string name="config_default_dns_server" translatable="false">8.8.8.8</string>
++    <string name="config_default_dns_server" translatable="false">169.239.202.202</string>
+ 
+     <!-- The default mobile provisioning apn. Empty by default, maybe overridden by
+          an mcc/mnc specific config.xml -->
+diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
+index bd884a3c972..7547447876d 100644
+--- a/packages/SettingsLib/res/values/strings.xml
++++ b/packages/SettingsLib/res/values/strings.xml
+@@ -921,9 +921,9 @@
+     <!-- Hint text for the IP address -->
+     <string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string>
+     <!-- Hint text for DNS -->
+-    <string name="wifi_dns1_hint" translatable="false">8.8.8.8</string>
++    <string name="wifi_dns1_hint" translatable="false">169.239.202.202</string>
+     <!-- Hint text for DNS -->
+-    <string name="wifi_dns2_hint" translatable="false">8.8.4.4</string>
++    <string name="wifi_dns2_hint" translatable="false">185.121.177.177</string>
+     <!-- Hint text for the gateway -->
+     <string name="wifi_gateway_hint" translatable="false">192.168.1.1</string>
+     <!-- Hint text for network prefix length -->
+diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
+index 85d1d1ef1d7..c71ecf8079f 100644
+--- a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
++++ b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
+@@ -85,9 +85,9 @@ import libcore.io.IoUtils;
+ public class NetworkDiagnostics {
+     private static final String TAG = "NetworkDiagnostics";
+ 
+-    private static final InetAddress TEST_DNS4 = NetworkUtils.numericToInetAddress("8.8.8.8");
++    private static final InetAddress TEST_DNS4 = NetworkUtils.numericToInetAddress("169.239.202.202");
+     private static final InetAddress TEST_DNS6 = NetworkUtils.numericToInetAddress(
+-            "2001:4860:4860::8888");
++            "2a05:dfc7:5353::53");
+ 
+     // For brevity elsewhere.
+     private static final long now() {
+diff --git a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java b/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
+index acbc10b9dc4..3a206e70774 100644
+--- a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
++++ b/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
+@@ -65,7 +65,7 @@ public class TetheringConfiguration {
+         "192.168.48.2", "192.168.48.254", "192.168.49.2", "192.168.49.254",
+     };
+ 
+-    private final String[] DEFAULT_IPV4_DNS = {"8.8.4.4", "8.8.8.8"};
++    private final String[] DEFAULT_IPV4_DNS = {"169.239.202.202", "185.121.177.177"};
+ 
+     public final String[] tetherableUsbRegexs;
+     public final String[] tetherableWifiRegexs;
+-- 
+2.17.0
+

Scripts/LineageOS-14.1/Patch.sh

@@ -82,7 +82,8 @@ sed -i 's|config_permissionReviewRequired">false|config_permissionReviewRequired
 patch -p1 < $patches"android_frameworks_base/0001-Reduced_Resolution.patch"; #Allow reducing resolution to save power TODO: Add 800x480
 patch -p1 < $patches"android_frameworks_base/0003-Signature_Spoofing.patch"; #Allow packages to spoof their signature (MicroG)
 patch -p1 < $patches"android_frameworks_base/0005-Harden_Sig_Spoofing.patch"; #Restrict signature spoofing to system apps signed with the platform key
-patch -p1 < $patches"android_frameworks_base/0006-Cloudflare.patch"; #Switch to Cloudflare DNS
+#patch -p1 < $patches"android_frameworks_base/0006-DNS_Cloudflare.patch"; #Switch to Cloudflare DNS
+patch -p1 < $patches"android_frameworks_base/0006-DNS_OpenNIC.patch"; #Switch to OpenNIC DNS
 rm -rf packages/PrintRecommendationService; #App that just creates popups to install proprietary print apps
 rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig;
 

Scripts/LineageOS-15.1/Patch.sh

@@ -79,7 +79,8 @@ sed -i 's/com.android.messaging/org.smssecure.smssecure/' core/res/res/values/co
 sed -i 's|config_permissionReviewRequired">false|config_permissionReviewRequired">true|' core/res/res/values/config.xml;
 patch -p1 < $patches"android_frameworks_base/0002-Signature_Spoofing.patch"; #Allow packages to spoof their signature (microG)
 patch -p1 < $patches"android_frameworks_base/0003-Harden_Sig_Spoofing.patch"; #Restrict signature spoofing to system apps signed with the platform key
-patch -p1 < $patches"android_frameworks_base/0004-Cloudflare.patch"; #Switch to Cloudflare DNS
+#patch -p1 < $patches"android_frameworks_base/0004-DNS_Cloudflare.patch"; #Switch to Cloudflare DNS
+patch -p1 < $patches"android_frameworks_base/0004-DNS_OpenNIC.patch"; #Switch to OpenNIC DNS
 if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then patch -p1 < $patches"android_frameworks_base/Copperhead/0005-Deny_USB.patch"; fi; #Deny USB support (Copperhead CC BY-NC-SA)
 rm -rf packages/PrintRecommendationService; #App that just creates popups to install proprietary print apps
 rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig;