Merge "Set the APN when DcNetworkAgent is created" into rvc-dev am: 0a7eed2a54 am: 724da0e7c5 (d11db408) · Commits · e / os / android_frameworks_opt_telephony

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

+16 −8

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.net.SocketKeepalive;
		import android.os.Message;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.Annotation.NetworkType;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.ServiceState;
		import android.telephony.TelephonyManager;
		@@ -85,6 +86,9 @@ public class DcNetworkAgent extends NetworkAgent {
		mTransportType = transportType;
		mDataConnection = dc;
		mNetworkInfo = new NetworkInfo(ni);
		setLegacyExtraInfo(dc.getApnSetting().getApnName());
		int subType = getNetworkType();
		setLegacySubtype(subType, TelephonyManager.getNetworkTypeName(subType));
		logd(mTag + " created for data connection " + dc.getName());
		}

		@@ -257,14 +261,7 @@ public class DcNetworkAgent extends NetworkAgent {
		setLegacyExtraInfo(extraInfo);
		}

		final ServiceState serviceState = mPhone.getServiceState();
		NetworkRegistrationInfo nri = serviceState.getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, mTransportType);
		int subType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		if (nri != null) {
		subType = nri.getAccessNetworkTechnology();
		}

		int subType = getNetworkType();
		if (mNetworkInfo.getSubtype() != subType) {
		setLegacySubtype(subType, TelephonyManager.getNetworkTypeName(subType));
		}
		@@ -356,6 +353,17 @@ public class DcNetworkAgent extends NetworkAgent {
		Rlog.e(mTag, s);
		}

		private @NetworkType int getNetworkType() {
		final ServiceState serviceState = mPhone.getServiceState();
		NetworkRegistrationInfo nri = serviceState.getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, mTransportType);
		int subType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		if (nri != null) {
		subType = nri.getAccessNetworkTechnology();
		}
		return subType;
		}

		class DcKeepaliveTracker {
		private class KeepaliveRecord {
		public int slotId;