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

Commit 07784264 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Remove the usage of hidden APIs from NetworkInfo"" into rvc-dev... 

Merge "Revert "Remove the usage of hidden APIs from NetworkInfo"" into rvc-dev am: a07b1974 am: c830a7f9 am: 46b3dc27

Change-Id: I2b9115d637f23090d79b637077bc805edc0adcbd
parents 8b8c9d91 46b3dc27

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

+19 −0
Original line number Diff line number Diff line
@@ -1723,6 +1723,7 @@ public class DataConnection extends StateMachine { 
                                + " drs=" + mDataRegState

                                + " mRilRat=" + mRilRat);

                    }

                    updateNetworkInfo();

                    break;

                default:

                    if (DBG) {
@@ -1735,6 +1736,19 @@ public class DataConnection extends StateMachine { 
        }

    }



    private void updateNetworkInfo() {

        final ServiceState state = mPhone.getServiceState();



        NetworkRegistrationInfo nri = state.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, mTransportType);

        int subtype = TelephonyManager.NETWORK_TYPE_UNKNOWN;

        if (nri != null) {

            subtype = nri.getAccessNetworkTechnology();

        }



        mNetworkInfo.setSubtype(subtype, TelephonyManager.getNetworkTypeName(subtype));

    }



    private void updateNetworkInfoSuspendState() {

        // this is only called when we are either connected or suspended.  Decide which.

        if (mNetworkAgent == null) {
@@ -2076,6 +2090,8 @@ public class DataConnection extends StateMachine { 
                    mApnSetting != null

                        ? mApnSetting.canHandleType(ApnSetting.TYPE_DEFAULT) : false);



            updateNetworkInfo();



            // If we were retrying there maybe more than one, otherwise they'll only be one.

            notifyAllWithEvent(null, DctConstants.EVENT_DATA_SETUP_COMPLETE,

                    Phone.REASON_CONNECTED);
@@ -2091,6 +2107,7 @@ public class DataConnection extends StateMachine { 


            mNetworkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED,

                    mNetworkInfo.getReason(), null);

            mNetworkInfo.setExtraInfo(mApnSetting.getApnName());

            updateTcpBufferSizes(mRilRat);

            updateLinkBandwidthsFromCarrierConfig(mRilRat);
@@ -2357,6 +2374,7 @@ public class DataConnection extends StateMachine { 
                case EVENT_DATA_CONNECTION_ROAM_ON:

                case EVENT_DATA_CONNECTION_ROAM_OFF:

                case EVENT_DATA_CONNECTION_OVERRIDE_CHANGED: {

                    updateNetworkInfo();

                    if (mNetworkAgent != null) {

                        mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),

                                DataConnection.this);
@@ -2378,6 +2396,7 @@ public class DataConnection extends StateMachine { 
                }

                case EVENT_DATA_CONNECTION_VOICE_CALL_STARTED:

                case EVENT_DATA_CONNECTION_VOICE_CALL_ENDED: {

                    updateNetworkInfo();

                    updateNetworkInfoSuspendState();

                    if (mNetworkAgent != null) {

                        mNetworkAgent.sendNetworkCapabilities(getNetworkCapabilities(),

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

+3 −14
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ import android.os.Message; 
import android.telephony.AccessNetworkConstants;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.AnomalyReporter;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.util.LocalLog;

import android.util.SparseArray;
@@ -284,19 +282,10 @@ public class DcNetworkAgent extends NetworkAgent { 
        if (!isOwned(dc, "sendNetworkInfo")) return;

        final NetworkInfo.State oldState = mNetworkInfo.getState();

        final NetworkInfo.State state = networkInfo.getState();

        String extraInfo = dc.getApnSetting().getApnName();

        if (mNetworkInfo.getExtraInfo() != extraInfo) {

            setLegacyExtraInfo(extraInfo);

        if (mNetworkInfo.getExtraInfo() != networkInfo.getExtraInfo()) {

            setLegacyExtraInfo(networkInfo.getExtraInfo());

        }



        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();

        }



        int subType = networkInfo.getSubtype();

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

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

        }