commit 7a250b82882c5ccc93cdd73ab62471470fa43e2c
author Narayan Kamath <narayan@google.com> Fri Dec 12 13:53:28 2014 +0000
committer Narayan Kamath <narayan@google.com> Mon Dec 15 14:32:38 2014 +0000
tree fb983c7da820b72f3ecf3bd6ad6cd3cdfd01ef9d
parent fe3b679090adfe16cbc1834e3d33bc17ac00ce17

Stop using apache-http in settings.

Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

(cherry picked from commit f25627c0c960cd31e069a0aed62798dd3a6416aa)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0

src/com/android/settings/wifi/WifiStatusTest.java

diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java
index dbd8eec..48921d7 100644
--- a/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/src/com/android/settings/wifi/WifiStatusTest.java
@@ -19,12 +19,8 @@
 import com.android.settings.R;
 
 import android.net.wifi.ScanResult;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.List;
 
 import android.app.Activity;
@@ -395,19 +391,22 @@
     }
 
     private void httpClientTest() {
-        HttpClient client = new DefaultHttpClient();
+        HttpURLConnection urlConnection = null;
         try {
             // TODO: Hardcoded for now, make it UI configurable
-            HttpGet request = new HttpGet("http://www.google.com");
-            HttpResponse response = client.execute(request);
-            if (response.getStatusLine().getStatusCode() == 200) {
+            URL url = new URL("http://www.google.com");
+            urlConnection = (HttpURLConnection) url.openConnection();
+            if (urlConnection.getResponseCode() == 200) {
                 mHttpClientTestResult = "Pass";
             } else {
-                mHttpClientTestResult = "Fail: Code: " + String.valueOf(response);
+                mHttpClientTestResult = "Fail: Code: " + urlConnection.getResponseMessage();
             }
-            request.abort();
         } catch (IOException e) {
             mHttpClientTestResult = "Fail: IOException";
+        } finally {
+            if (urlConnection != null) {
+                urlConnection.disconnect();
+            }
         }
     }