Merge "Switch to using the NetworkAgentConfig.Builder API." (dd5a342b) · Commits · e / os / android_frameworks_opt_telephony

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

+12 −5

Original line number	Diff line number	Diff line
		@@ -2044,17 +2044,23 @@ public class DataConnection extends StateMachine {
		mNetworkInfo.setExtraInfo(mApnSetting.getApnName());
		updateTcpBufferSizes(mRilRat);

		final NetworkAgentConfig config = new NetworkAgentConfig();
		final NetworkAgentConfig.Builder configBuilder = new NetworkAgentConfig.Builder();
		final CarrierSignalAgent carrierSignalAgent = mPhone.getCarrierSignalAgent();
		if (carrierSignalAgent.hasRegisteredReceivers(TelephonyManager
		.ACTION_CARRIER_SIGNAL_REDIRECTED)) {
		// carrierSignal Receivers will place the carrier-specific provisioning notification
		config.provisioningNotificationDisabled = true;
		configBuilder.disableProvisioningNotification();
		}

		final String subscriberId = mPhone.getSubscriberId();
		if (!TextUtils.isEmpty(subscriberId)) {
		configBuilder.setSubscriberId(subscriberId);
		}
		config.subscriberId = mPhone.getSubscriberId();

		// set skip464xlat if it is not default otherwise
		config.skip464xlat = shouldSkip464Xlat();
		if (shouldSkip464Xlat()) {
		configBuilder.disableNat64Detection();
		}

		mUnmeteredUseOnly = isUnmeteredUseOnly();

		@@ -2112,7 +2118,8 @@ public class DataConnection extends StateMachine {
		mDisabledApnTypeBitMask \|= getDisallowedApnTypes();

		mNetworkAgent = new DcNetworkAgent(DataConnection.this,
		mPhone, mNetworkInfo, mScore, config, providerId, mTransportType);
		mPhone, mNetworkInfo, mScore, configBuilder.build(), providerId,
		mTransportType);
		}

		if (mTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {