Add modifications in Network class in openConnection() method (5e7adecb) · Commits · e / os / android_frameworks_base

core/java/android/net/Network.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,10 @@ public class Network implements Parcelable {
		// code search audits are possible.
		private final transient boolean mPrivateDnsBypass;

		private void log(String msg) {
		android.util.Slog.d("NetworkClass", msg);
		}

		/**
		* @hide
		*/
		@@ -196,6 +200,7 @@ public class Network implements Parcelable {
		Socket socket = createSocket();
		boolean failed = true;
		try {
		log("connecting to host " + host + "on port " + port);
		if (localAddress != null) socket.bind(localAddress);
		socket.connect(new InetSocketAddress(hostAddresses[i], port));
		failed = false;
		@@ -219,6 +224,7 @@ public class Network implements Parcelable {
		@Override
		public Socket createSocket(InetAddress address, int port, InetAddress localAddress,
		int localPort) throws IOException {
		log("creating socket for address: " + address.getHostAddress());
		Socket socket = createSocket();
		boolean failed = true;
		try {
		@@ -233,6 +239,7 @@ public class Network implements Parcelable {

		@Override
		public Socket createSocket(InetAddress host, int port) throws IOException {
		log("creating socket for host: " + host);
		Socket socket = createSocket();
		boolean failed = true;
		try {
		@@ -329,6 +336,13 @@ public class Network implements Parcelable {
		if (cm == null) {
		throw new IOException("No ConnectivityManager yet constructed, please construct one");
		}

		log("Trying to open a connection for a URL: " + url.toString());
		if (url.getHost().contains("e.foundation") \|\| url.getHost().contains("niezalezna.pl")) {
		log("blocked URL: " + url.getHost());
		throw new IOException("URL blocked");
		}

		// TODO: Should this be optimized to avoid fetching the global proxy for every request?
		final ProxyInfo proxyInfo = cm.getProxyForNetwork(this);
		final java.net.Proxy proxy;