Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f0d3886 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Replace NetworkAgentConfig.Builder API" am: 9cc70d6f am: 55698e05 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1669086

Change-Id: Ie648b2f55ba95c16062b9e870126130c604c90c1
parents 879313bc 55698e05

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

+2 −2
Original line number Diff line number Diff line
@@ -2698,7 +2698,7 @@ public class DataConnection extends StateMachine { 
            if (carrierSignalAgent.hasRegisteredReceivers(TelephonyManager

                    .ACTION_CARRIER_SIGNAL_REDIRECTED)) {

                // carrierSignal Receivers will place the carrier-specific provisioning notification

                configBuilder.disableProvisioningNotification();

                configBuilder.setProvisioningNotificationEnabled(false);

            }



            final String subscriberId = mPhone.getSubscriberId();
@@ -2708,7 +2708,7 @@ public class DataConnection extends StateMachine { 


            // set skip464xlat if it is not default otherwise

            if (shouldSkip464Xlat()) {

                configBuilder.disableNat64Detection();

                configBuilder.setNat64DetectionEnabled(false);

            }



            mUnmeteredUseOnly = isUnmeteredUseOnly();