diff options
author | Narayan Kamath <narayan@google.com> | 2014-12-12 13:53:28 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-12-12 14:22:06 +0000 |
commit | f25627c0c960cd31e069a0aed62798dd3a6416aa (patch) | |
tree | d3eb4839a54f1da0d4d2b974af233402d600d620 /src/com/android/settings/RadioInfo.java | |
parent | e6af93277c5c5fe9c76af59a4b1d523143f2da93 (diff) | |
download | packages_apps_Settings-f25627c0c960cd31e069a0aed62798dd3a6416aa.zip packages_apps_Settings-f25627c0c960cd31e069a0aed62798dd3a6416aa.tar.gz packages_apps_Settings-f25627c0c960cd31e069a0aed62798dd3a6416aa.tar.bz2 |
Stop using apache-http in settings.
Most of this usage is from crufty "test" code, and is trivially
replacable.
bug: 18027885
Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
Diffstat (limited to 'src/com/android/settings/RadioInfo.java')
-rw-r--r-- | src/com/android/settings/RadioInfo.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index b0a4a53..cec00d0 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -17,7 +17,6 @@ package com.android.settings; import android.app.Activity; -import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; @@ -55,10 +54,8 @@ import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.PhoneStateIntentReceiver; import com.android.internal.telephony.TelephonyProperties; -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.io.IOException; import java.net.UnknownHostException; @@ -745,18 +742,22 @@ public class RadioInfo extends Activity { * This function checks for basic functionality of HTTP Client. */ private void httpClientTest() { - HttpClient client = new DefaultHttpClient(); + HttpURLConnection urlConnection = null; try { - HttpGet request = new HttpGet("http://www.google.com"); - HttpResponse response = client.execute(request); - if (response.getStatusLine().getStatusCode() == 200) { + // TODO: Hardcoded for now, make it UI configurable + 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(); + } } } |