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

Commit d33b103d authored by Frank Li's avatar Frank Li Committed by Automerger Merge Worker
Browse files

Merge "[TL03]Remove hidden API usage of NetworkAgent" am: 6ee291a2 

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

Change-Id: I3925117305460d7ba3583024e26f81059bf4e7b0
parents 342459e0 6ee291a2

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

+4 −1
Original line number Diff line number Diff line
@@ -2689,6 +2689,9 @@ public class DataConnection extends StateMachine { 
            final NetworkAgentConfig.Builder configBuilder = new NetworkAgentConfig.Builder();

            configBuilder.setLegacyType(ConnectivityManager.TYPE_MOBILE);

            configBuilder.setLegacyTypeName(NETWORK_TYPE);

            int networkType = getNetworkType();

            configBuilder.setLegacySubType(networkType);

            configBuilder.setLegacySubTypeName(TelephonyManager.getNetworkTypeName(networkType));

            configBuilder.setLegacyExtraInfo(mApnSetting.getApnName());

            final CarrierSignalAgent carrierSignalAgent = mPhone.getCarrierSignalAgent();

            if (carrierSignalAgent.hasRegisteredReceivers(TelephonyManager
@@ -3059,7 +3062,7 @@ public class DataConnection extends StateMachine { 
                    if (handle < 0) {

                        loge("No slot found for stopSocketKeepalive! " + slotId);

                        mNetworkAgent.sendSocketKeepaliveEvent(

                                slotId, SocketKeepalive.NO_KEEPALIVE);

                                slotId, SocketKeepalive.ERROR_NO_SUCH_SLOT);

                        retVal = HANDLED;

                        break;

                    } else {

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

+0 −3
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ public class DcNetworkAgent extends NetworkAgent { 
        mNetworkCapabilities = dc.getNetworkCapabilities();

        mTransportType = transportType;

        mDataConnection = dc;

        int networkType = getNetworkType();

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

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

        if (dc.getLinkProperties() != null) {

            checkDuplicateInterface(mId, dc.getLinkProperties().getInterfaceName());

            logd("created for data connection " + dc.getName() + ", "