summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/com/android/settings/RadioInfo.java23
-rw-r--r--src/com/android/settings/wifi/WifiStatusTest.java23
-rw-r--r--tests/src/com/android/settings/vpn2/VpnTests.java33
3 files changed, 43 insertions, 36 deletions
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 378221c..7aac59b 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();
+ }
}
}
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 @@ 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();
+ }
}
}
diff --git a/tests/src/com/android/settings/vpn2/VpnTests.java b/tests/src/com/android/settings/vpn2/VpnTests.java
index 7d5961d..6a01cc5 100644
--- a/tests/src/com/android/settings/vpn2/VpnTests.java
+++ b/tests/src/com/android/settings/vpn2/VpnTests.java
@@ -18,8 +18,6 @@ package com.android.settings.vpn2;
import android.content.Context;
import android.net.IConnectivityManager;
-import android.net.LinkAddress;
-import android.net.RouteInfo;
import android.os.Bundle;
import android.os.Environment;
import android.os.RemoteException;
@@ -35,13 +33,11 @@ import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile;
+import java.net.HttpURLConnection;
+import java.net.URL;
import junit.framework.Assert;
-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 org.apache.http.util.EntityUtils;
+import libcore.io.Streams;
import org.json.JSONException;
import org.json.JSONObject;
@@ -228,14 +224,21 @@ public class VpnTests extends InstrumentationTestCase {
*/
private String getIpAddress() {
String ip = null;
+ HttpURLConnection urlConnection = null;
try {
- HttpClient httpClient = new DefaultHttpClient();
- HttpGet httpGet = new HttpGet(EXTERNAL_SERVER);
- HttpResponse httpResponse = httpClient.execute(httpGet);
- Log.i(TAG, "Response from httpget: " + httpResponse.getStatusLine().toString());
+ URL url = new URL(EXTERNAL_SERVER);
+ urlConnection = (HttpURLConnection) url.openConnection();
+ Log.i(TAG, "Response from httpget: " + urlConnection.getResponseCode());
- String entityStr = EntityUtils.toString(httpResponse.getEntity());
- JSONObject json_data = new JSONObject(entityStr);
+ InputStream is = urlConnection.getInputStream();
+ String response;
+ try {
+ response = new String(Streams.readFully(is), StandardCharsets.UTF_8);
+ } finally {
+ is.close();
+ }
+
+ JSONObject json_data = new JSONObject(response);
ip = json_data.getString("ip");
Log.v(TAG, "json_data: " + ip);
} catch (IllegalArgumentException e) {
@@ -244,6 +247,10 @@ public class VpnTests extends InstrumentationTestCase {
Log.e(TAG, "IOException while getting IP: " + e.toString());
} catch (JSONException e) {
Log.e(TAG, "exception while creating JSONObject: " + e.toString());
+ } finally {
+ if (urlConnection != null) {
+ urlConnection.disconnect();
+ }
}
return ip;
}
generated by cgit v1.1 at 2024-05-28 23:32:59 +0000