PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using apache-http in settings.

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

bug: 18027885

(cherry picked from commit f25627c0c9)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
This commit is contained in:
Narayan Kamath
2014-12-12 13:53:28 +00:00
parent fe3b679090
commit 7a250b8288
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/wifi/WifiStatusTest.java
View File

@@ -19,12 +19,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;
@@ -395,19 +391,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();
}
}
}