Merge "Update APN proxy beforer network agent created." am: 6e30ffedad (ed8a96ce) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+21 −3

Original line number	Diff line number	Diff line
		@@ -454,8 +454,26 @@ public class DataConnection extends StateMachine {
		return mApnSetting;
		}

		void setLinkPropertiesHttpProxy(ProxyInfo proxy) {
		/**
		* Update http proxy of link properties based on current apn setting
		*/
		private void updateLinkPropertiesHttpProxy() {
		if (mApnSetting == null
		\|\| TextUtils.isEmpty(mApnSetting.getProxyAddressAsString())) {
		return;
		}
		try {
		int port = mApnSetting.getProxyPort();
		if (port == -1) {
		port = 8080;
		}
		ProxyInfo proxy = ProxyInfo.buildDirectProxy(
		mApnSetting.getProxyAddressAsString(), port);
		mLinkProperties.setHttpProxy(proxy);
		} catch (NumberFormatException e) {
		loge("onDataSetupComplete: NumberFormatException making ProxyProperties ("
		+ mApnSetting.getProxyPort() + "): " + e);
		}
		}

		public static class UpdateLinkPropertyResult {
		@@ -2189,7 +2207,7 @@ public class DataConnection extends StateMachine {
		final NetworkProvider provider = (null == factory) ? null : factory.getProvider();

		mDisabledApnTypeBitMask \|= getDisallowedApnTypes();

		updateLinkPropertiesHttpProxy();
		mNetworkAgent = new DcNetworkAgent(DataConnection.this,
		mPhone, mNetworkInfo, mScore, configBuilder.build(), provider,
		mTransportType);

+0 −15

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import android.net.NetworkAgent;
		import android.net.NetworkCapabilities;
		import android.net.NetworkPolicyManager;
		import android.net.NetworkRequest;
		import android.net.ProxyInfo;
		import android.net.TrafficStats;
		import android.net.Uri;
		import android.os.AsyncResult;
		@@ -2828,20 +2827,6 @@ public class DcTracker extends Handler {
		log("onDataSetupComplete: success apn=" + (apn == null ? "unknown"
		: apn.getApnName()));
		}
		if (apn != null && !TextUtils.isEmpty(apn.getProxyAddressAsString())) {
		try {
		int port = apn.getProxyPort();
		if (port == -1) {
		port = 8080;
		}
		ProxyInfo proxy = ProxyInfo.buildDirectProxy(
		apn.getProxyAddressAsString(), port);
		dataConnection.setLinkPropertiesHttpProxy(proxy);
		} catch (NumberFormatException e) {
		loge("onDataSetupComplete: NumberFormatException making ProxyProperties ("
		+ apn.getProxyPort() + "): " + e);
		}
		}

		// everything is setup
		if (TextUtils.equals(apnContext.getApnType(), PhoneConstants.APN_TYPE_DEFAULT)