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

Commit febec3c7 authored by Ying Xu's avatar Ying Xu Committed by Automerger Merge Worker
Browse files

Revert "Set the APN when DcNetworkAgent is created" am: e12e6a29 

Change-Id: I28faa576ce2b559d16a0fdf9dc79a62dcf7d6981
parents 4b9d1e7e e12e6a29

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

+8 −16
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.net.Uri; 
import android.os.Message;

import android.telephony.AccessNetworkConstants;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.Annotation.NetworkType;

import android.telephony.AnomalyReporter;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.ServiceState;
@@ -96,9 +95,6 @@ public class DcNetworkAgent extends NetworkAgent { 
        mTransportType = transportType;

        mDataConnection = dc;

        mNetworkInfo = new NetworkInfo(ni);

        setLegacyExtraInfo(dc.getApnSetting().getApnName());

        int subType = getNetworkType();

        setLegacySubtype(subType, TelephonyManager.getNetworkTypeName(subType));

        // TODO: Remove after b/151487565 is fixed.

        sNetworkAgents.add(this);

        checkRedundantIms();
@@ -293,7 +289,14 @@ public class DcNetworkAgent extends NetworkAgent { 
            setLegacyExtraInfo(extraInfo);

        }



        int subType = getNetworkType();

        final ServiceState serviceState = mPhone.getServiceState();

        NetworkRegistrationInfo nri = serviceState.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, mTransportType);

        int subType = TelephonyManager.NETWORK_TYPE_UNKNOWN;

        if (nri != null) {

            subType = nri.getAccessNetworkTechnology();

        }



        if (mNetworkInfo.getSubtype() != subType) {

            setLegacySubtype(subType, TelephonyManager.getNetworkTypeName(subType));

        }
@@ -386,17 +389,6 @@ public class DcNetworkAgent extends NetworkAgent { 
        Rlog.e(mTag, s);

    }



    private @NetworkType int getNetworkType() {

        final ServiceState serviceState = mPhone.getServiceState();

        NetworkRegistrationInfo nri = serviceState.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, mTransportType);

        int subType = TelephonyManager.NETWORK_TYPE_UNKNOWN;

        if (nri != null) {

            subType = nri.getAccessNetworkTechnology();

        }

        return subType;

    }



    class DcKeepaliveTracker {

        private class KeepaliveRecord {

            public int slotId;