commit dd5a342b572501e7bf82e9a73754763d6f6a65b1
author Lorenzo Colitti <lorenzo@google.com> Tue Jan 14 05:01:07 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 14 05:01:07 2020 +0000
tree b08a91784405cb8c3c5c432254df9a1eb1815add
parent 978445e31eca6ec6d203627f02a3ef4cac85dac7
parent 199a4751a8e832156a77314dfc9968ffbe033ded

Merge "Switch to using the NetworkAgentConfig.Builder API."

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

diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index 1d3aeeb..e5d81eb 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -2044,17 +2044,23 @@
             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();
             }
-            config.subscriberId = mPhone.getSubscriberId();
+
+            final String subscriberId = mPhone.getSubscriberId();
+            if (!TextUtils.isEmpty(subscriberId)) {
+                configBuilder.setSubscriberId(subscriberId);
+            }
 
             // set skip464xlat if it is not default otherwise
-            config.skip464xlat = shouldSkip464Xlat();
+            if (shouldSkip464Xlat()) {
+                configBuilder.disableNat64Detection();
+            }
 
             mUnmeteredUseOnly = isUnmeteredUseOnly();
 
@@ -2112,7 +2118,8 @@
                 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) {