From 491d1837e966e904cae66a24b56fd4c35e2c0a7d Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Fri, 10 Jul 2020 03:40:35 +0000 Subject: [PATCH] Revert "Attribute data usage to 5G for 5G non-standalone mode" This reverts commit 7e5b9894a41436953ef9f06c144414f5db3522cb. Reason for revert: Revert and wait for the design is settled down. Change-Id: I10fdfc37d6456678de1886698cd6ad08bf8aa810 --- .../net/NetworkStatsSubscriptionsMonitor.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java b/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java index dc64393bbf..7711c6a21d 100644 --- a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java +++ b/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java @@ -22,7 +22,6 @@ import android.annotation.NonNull; import android.content.Context; import android.os.Looper; import android.telephony.Annotation; -import android.telephony.NetworkRegistrationInfo; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; @@ -197,19 +196,7 @@ public class NetworkStatsSubscriptionsMonitor extends @Override public void onServiceStateChanged(@NonNull ServiceState ss) { - // In 5G SA (Stand Alone) mode, the primary cell itself will be 5G hence telephony - // would report RAT = 5G_NR. - // However, in 5G NSA (Non Stand Alone) mode, the primary cell is still LTE and - // network allocates a secondary 5G cell so telephony reports RAT = LTE along with - // NR state as connected. In such case, attributes the data usage to NR. - // See b/160727498. - final boolean is5GNsa = (ss.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE - || ss.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE_CA) - && ss.getNrState() == NetworkRegistrationInfo.NR_STATE_CONNECTED; - - final int networkType = - (is5GNsa ? TelephonyManager.NETWORK_TYPE_NR : ss.getDataNetworkType()); - + final int networkType = ss.getDataNetworkType(); final int collapsedRatType = getCollapsedRatType(networkType); if (collapsedRatType == mLastCollapsedRatType) return;