Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I92f7bcff689d8f13c0302aba7afe6008a417722d
This commit is contained in:
TreeHugger Robot
2020-05-04 16:19:40 +00:00
committed by Automerger Merge Worker
parent c88d953406 c64b2ce195
commit 445f86fa76
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/connectivity/DataConnectionStats.java
View File

@@ -50,6 +50,7 @@ public class DataConnectionStats extends BroadcastReceiver {
private SignalStrength mSignalStrength; private SignalStrength mSignalStrength;
private ServiceState mServiceState; private ServiceState mServiceState;
private int mDataState = TelephonyManager.DATA_DISCONNECTED; private int mDataState = TelephonyManager.DATA_DISCONNECTED;
private int mNrState = NetworkRegistrationInfo.NR_STATE_NONE;
public DataConnectionStats(Context context, Handler listenerHandler) { public DataConnectionStats(Context context, Handler listenerHandler) {
mContext = context; mContext = context;
@@ -99,6 +100,11 @@ public class DataConnectionStats extends BroadcastReceiver {
mServiceState.getNetworkRegistrationInfo(DOMAIN_PS, TRANSPORT_TYPE_WWAN); mServiceState.getNetworkRegistrationInfo(DOMAIN_PS, TRANSPORT_TYPE_WWAN);
int networkType = regInfo == null ? TelephonyManager.NETWORK_TYPE_UNKNOWN int networkType = regInfo == null ? TelephonyManager.NETWORK_TYPE_UNKNOWN
: regInfo.getAccessNetworkTechnology(); : 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", if (DEBUG) Log.d(TAG, String.format("Noting data connection for network type %s: %svisible",
networkType, visible ? "" : "not ")); networkType, visible ? "" : "not "));
try { try {
@@ -153,6 +159,7 @@ public class DataConnectionStats extends BroadcastReceiver {
@Override @Override
public void onServiceStateChanged(ServiceState state) { public void onServiceStateChanged(ServiceState state) {
mServiceState = state; mServiceState = state;
mNrState = state.getNrState();
notePhoneDataConnectionState(); notePhoneDataConnectionState();
} }