Stop using apache-http in settings.
Most of this usage is from crufty "test" code, and is trivially replacable. bug: 18027885 Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
This commit is contained in:
@@ -18,10 +18,8 @@ package com.android.settings.wifi;
|
||||
|
||||
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;
|
||||
import android.content.BroadcastReceiver;
|
||||
@@ -388,19 +386,22 @@ public class WifiStatusTest extends Activity {
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user