summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-03 20:46:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-03 20:46:09 +0000
commit8019aa6b7bc9be660faac081772f25f9d6bcbff0 (patch)
tree1854219733c60d64b549df2f39266b98b159091e /src/com
parent851532f37fa01930300bdbc951dcc311d066de02 (diff)
parentb009023c76227b6c984652683be7d054033eb935 (diff)
downloadpackages_apps_Settings-8019aa6b7bc9be660faac081772f25f9d6bcbff0.zip
packages_apps_Settings-8019aa6b7bc9be660faac081772f25f9d6bcbff0.tar.gz
packages_apps_Settings-8019aa6b7bc9be660faac081772f25f9d6bcbff0.tar.bz2
Merge "Make Settings app not use cleartext network traffic."
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/RadioInfo.java2
-rw-r--r--src/com/android/settings/wifi/WifiStatusTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 77927d9..fa98bac 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -754,7 +754,7 @@ public class RadioInfo extends Activity {
HttpURLConnection urlConnection = null;
try {
// TODO: Hardcoded for now, make it UI configurable
- URL url = new URL("http://www.google.com");
+ URL url = new URL("https://www.google.com");
urlConnection = (HttpURLConnection) url.openConnection();
if (urlConnection.getResponseCode() == 200) {
mHttpClientTestResult = "Pass";
diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java
index 85afb7c..269058c 100644
--- a/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/src/com/android/settings/wifi/WifiStatusTest.java
@@ -396,7 +396,7 @@ public class WifiStatusTest extends Activity {
HttpURLConnection urlConnection = null;
try {
// TODO: Hardcoded for now, make it UI configurable
- URL url = new URL("http://www.google.com");
+ URL url = new URL("https://www.google.com");
urlConnection = (HttpURLConnection) url.openConnection();
if (urlConnection.getResponseCode() == 200) {
mHttpClientTestResult = "Pass";