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

resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

Browse Source 
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
This commit is contained in:
Narayan Kamath
2014-12-15 16:27:39 +00:00
parent 755005bddf fa89388641
commit 62d35b65f2
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/src/com/android/settings/vpn2/VpnTests.java
View File

@@ -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;
}