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

Commit 20e6bace authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge changes from topic "networkagent" 

* changes:
  Switch to using the NetworkAgentConfig.Builder API.
  Rename NetworkMisc to NetworkAgentConfig in telephony.
parents 739e64d3 d41f94df

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

+14 −7
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ import android.net.InetAddresses; 
import android.net.KeepalivePacketData;

import android.net.LinkAddress;

import android.net.LinkProperties;

import android.net.NetworkAgentConfig;

import android.net.NetworkCapabilities;

import android.net.NetworkFactory;

import android.net.NetworkInfo;

import android.net.NetworkMisc;

import android.net.NetworkProvider;

import android.net.NetworkRequest;

import android.net.ProxyInfo;
@@ -51,7 +51,6 @@ import android.telephony.Annotation.DataFailureCause; 
import android.telephony.CarrierConfigManager;

import android.telephony.DataFailCause;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -87,6 +86,7 @@ import com.android.internal.util.IndentingPrintWriter; 
import com.android.internal.util.Protocol;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -2050,17 +2050,23 @@ public class DataConnection extends StateMachine { 
            mNetworkInfo.setExtraInfo(mApnSetting.getApnName());

            updateTcpBufferSizes(mRilRat);



            final NetworkMisc misc = new NetworkMisc();

            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

                misc.provisioningNotificationDisabled = true;

                configBuilder.disableProvisioningNotification();

            }



            final String subscriberId = mPhone.getSubscriberId();

            if (!TextUtils.isEmpty(subscriberId)) {

                configBuilder.setSubscriberId(subscriberId);

            }

            misc.subscriberId = mPhone.getSubscriberId();



            // set skip464xlat if it is not default otherwise

            misc.skip464xlat = shouldSkip464Xlat();

            if (shouldSkip464Xlat()) {

                configBuilder.disableNat64Detection();

            }



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



                mNetworkAgent = new DcNetworkAgent(DataConnection.this,

                        mPhone, mNetworkInfo, mScore, misc, providerId, mTransportType);

                        mPhone, mNetworkInfo, mScore, configBuilder.build(), providerId,

                        mTransportType);

            }



            if (mTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {

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

+5 −5
Original line number Diff line number Diff line
@@ -20,14 +20,13 @@ import android.annotation.NonNull; 
import android.net.LinkProperties;

import android.net.NattKeepalivePacketData;

import android.net.NetworkAgent;

import android.net.NetworkAgentConfig;

import android.net.NetworkCapabilities;

import android.net.NetworkInfo;

import android.net.NetworkMisc;

import android.net.SocketKeepalive;

import android.os.Message;

import android.telephony.AccessNetworkConstants;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.Rlog;

import android.util.LocalLog;

import android.util.SparseArray;
@@ -36,6 +35,7 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.util.IndentingPrintWriter;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -67,10 +67,10 @@ public class DcNetworkAgent extends NetworkAgent { 


    private NetworkInfo mNetworkInfo;



    DcNetworkAgent(DataConnection dc, Phone phone, NetworkInfo ni, int score, NetworkMisc misc,

                   int factorySerialNumber, int transportType) {

    DcNetworkAgent(DataConnection dc, Phone phone, NetworkInfo ni, int score,

            NetworkAgentConfig config, int factorySerialNumber, int transportType) {

        super(dc.getHandler().getLooper(), phone.getContext(), "DcNetworkAgent", ni,

                dc.getNetworkCapabilities(), dc.getLinkProperties(), score, misc,

                dc.getNetworkCapabilities(), dc.getLinkProperties(), score, config,

                factorySerialNumber);

        mTag = "DcNetworkAgent" + "-" + network.netId;

        mPhone = phone;