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

Commit 6fca0c40 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Icf030a297deed273e28ab663b137cd41941df292
parents 6de00059 5f0d3886

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

+2 −2
Original line number Diff line number Diff line
@@ -2741,7 +2741,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();
@@ -2751,7 +2751,7 @@ public class DataConnection extends StateMachine { 


            // set skip464xlat if it is not default otherwise

            if (shouldSkip464Xlat()) {

                configBuilder.disableNat64Detection();

                configBuilder.setNat64DetectionEnabled(false);

            }



            mUnmeteredUseOnly = isUnmeteredUseOnly();