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

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

Merge "Report NSA NR As NR Cell Dwell Rate Metric" into rvc-dev am: c64b2ce1 am: 97dd48cf 

Change-Id: Ieaedf40a32a164a29b40bdb9a28217d789cc5a3c
parents 87a8e063 97dd48cf

services/core/java/com/android/server/connectivity/DataConnectionStats.java

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class DataConnectionStats extends BroadcastReceiver { 
    private SignalStrength mSignalStrength;

    private ServiceState mServiceState;

    private int mDataState = TelephonyManager.DATA_DISCONNECTED;

    private int mNrState = NetworkRegistrationInfo.NR_STATE_NONE;



    public DataConnectionStats(Context context, Handler listenerHandler) {

        mContext = context;
@@ -99,6 +100,11 @@ public class DataConnectionStats extends BroadcastReceiver { 
                mServiceState.getNetworkRegistrationInfo(DOMAIN_PS, TRANSPORT_TYPE_WWAN);

        int networkType = regInfo == null ? TelephonyManager.NETWORK_TYPE_UNKNOWN

                : regInfo.getAccessNetworkTechnology();

        // If the device is in NSA NR connection the networkType will report as LTE.

        // For cell dwell rate metrics, this should report NR instead.

        if (mNrState == NetworkRegistrationInfo.NR_STATE_CONNECTED) {

            networkType = TelephonyManager.NETWORK_TYPE_NR;

        }

        if (DEBUG) Log.d(TAG, String.format("Noting data connection for network type %s: %svisible",

                networkType, visible ? "" : "not "));

        try {
@@ -153,6 +159,7 @@ public class DataConnectionStats extends BroadcastReceiver { 
        @Override

        public void onServiceStateChanged(ServiceState state) {

            mServiceState = state;

            mNrState = state.getNrState();

            notePhoneDataConnectionState();

        }