commit 199a4751a8e832156a77314dfc9968ffbe033ded
author Lorenzo Colitti <lorenzo@google.com> Mon Jan 13 23:49:45 2020 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Jan 14 00:32:42 2020 +0900
tree 067dbd84b2c22c9b841895a761914b33a6e20fe6
parent 5894cac3333dc81ab77863fca906c2a1ac84ab19

Switch to using the NetworkAgentConfig.Builder API.

Bug: 138306002
Test: atest FrameworksTelephonyTests
Test: builds, boots, wifi works, telephony works
Change-Id: I040efef2a92e7ddc5d437ea3df31357e7f0c4377

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 86a8d2a..142a026 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -2045,17 +2045,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(TelephonyIntents
                     .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();
 
@@ -2113,7 +2119,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) {