Merge "Remove the usage of hidden APIs from NetworkInfo" (1543d37c) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −20

Original line number	Diff line number	Diff line
		@@ -1658,7 +1658,6 @@ public class DataConnection extends StateMachine {
		+ " drs=" + mDataRegState
		+ " mRilRat=" + mRilRat);
		}
		updateNetworkInfo();
		updateNetworkInfoSuspendState();
		if (mNetworkAgent != null) {
		mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),
		@@ -1671,7 +1670,6 @@ public class DataConnection extends StateMachine {
		case EVENT_DATA_CONNECTION_ROAM_OFF:
		case EVENT_DATA_CONNECTION_METEREDNESS_CHANGED:
		case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED:
		updateNetworkInfo();
		if (mNetworkAgent != null) {
		mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),
		DataConnection.this);
		@@ -1696,19 +1694,6 @@ public class DataConnection extends StateMachine {
		}
		}

		private void updateNetworkInfo() {
		final ServiceState state = mPhone.getServiceState();

		NetworkRegistrationInfo nri = state.getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, mTransportType);
		int subtype = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		if (nri != null) {
		subtype = nri.getAccessNetworkTechnology();
		}

		mNetworkInfo.setSubtype(subtype, TelephonyManager.getNetworkTypeName(subtype));
		}

		private void updateNetworkInfoSuspendState() {
		// this is only called when we are either connected or suspended. Decide which.
		if (mNetworkAgent == null) {
		@@ -2040,8 +2025,6 @@ public class DataConnection extends StateMachine {
		mApnSetting != null
		? mApnSetting.canHandleType(ApnSetting.TYPE_DEFAULT) : false);

		updateNetworkInfo();

		// If we were retrying there maybe more than one, otherwise they'll only be one.
		notifyAllWithEvent(null, DctConstants.EVENT_DATA_SETUP_COMPLETE,
		Phone.REASON_CONNECTED);
		@@ -2057,7 +2040,6 @@ public class DataConnection extends StateMachine {

		mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED,
		mNetworkInfo.getReason(), null);
		mNetworkInfo.setExtraInfo(mApnSetting.getApnName());
		updateTcpBufferSizes(mRilRat);

		final NetworkAgentConfig.Builder configBuilder = new NetworkAgentConfig.Builder();
		@@ -2278,7 +2260,6 @@ public class DataConnection extends StateMachine {
		case EVENT_DATA_CONNECTION_ROAM_OFF:
		case EVENT_DATA_CONNECTION_METEREDNESS_CHANGED:
		case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED: {
		updateNetworkInfo();
		if (mNetworkAgent != null) {
		mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),
		DataConnection.this);
		@@ -2306,7 +2287,6 @@ public class DataConnection extends StateMachine {
		}
		case EVENT_DATA_CONNECTION_VOICE_CALL_STARTED:
		case EVENT_DATA_CONNECTION_VOICE_CALL_ENDED: {
		updateNetworkInfo();
		updateNetworkInfoSuspendState();
		if (mNetworkAgent != null) {
		mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),

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

+14 −3

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ import android.net.SocketKeepalive;
		import android.os.Message;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.ServiceState;
		import android.telephony.TelephonyManager;
		import android.util.LocalLog;
		import android.util.SparseArray;
		@@ -250,10 +252,19 @@ public class DcNetworkAgent extends NetworkAgent {
		if (!isOwned(dc, "sendNetworkInfo")) return;
		final NetworkInfo.State oldState = mNetworkInfo.getState();
		final NetworkInfo.State state = networkInfo.getState();
		if (mNetworkInfo.getExtraInfo() != networkInfo.getExtraInfo()) {
		setLegacyExtraInfo(networkInfo.getExtraInfo());
		String extraInfo = dc.getApnSetting().getApnName();
		if (mNetworkInfo.getExtraInfo() != extraInfo) {
		setLegacyExtraInfo(extraInfo);
		}
		final int subType = networkInfo.getSubtype();

		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();
		}

		if (mNetworkInfo.getSubtype() != subType) {
		setLegacySubtype(subType, TelephonyManager.getNetworkTypeName(subType));
		}