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

Commit 7368ed7d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I7d98ab42,I8753e681 into rvc-dev 

* changes:
  Report NR connected state to provide resolution of 5G NSA mode
  Attribute data usage to virtual RAT type for 5G non-standalone mode
parents 311f3508 472144c3

cmds/statsd/src/atoms.proto

+6 −0
Original line number Diff line number Diff line
@@ -5178,6 +5178,12 @@ message DataUsageBytesTransfer { 
    // record is combined across opportunistic data subscriptions.

    // See {@link SubscriptionManager#setOpportunistic}.

    optional DataSubscriptionState opportunistic_data_sub = 10;



    // Indicate whether NR is connected, server side could use this with RAT type to determine if

    // the record is for 5G NSA (Non Stand Alone) mode, where the primary cell is still LTE and

    // network allocates a secondary 5G cell so telephony reports RAT = LTE along with NR state as

    // connected.

    optional bool is_nr_connected = 11;

}



/**

core/java/android/net/NetworkTemplate.java

+12 −0
Original line number Diff line number Diff line
@@ -87,6 +87,15 @@ public class NetworkTemplate implements Parcelable { 
     * @hide

     */

    public static final int NETWORK_TYPE_ALL = -1;

    /**

     * Virtual RAT type to represent 5G NSA (Non Stand Alone) mode, where the primary cell is

     * still LTE and network allocates a secondary 5G cell so telephony reports RAT = LTE along

     * with NR state as connected. This should not be overlapped with any of the

     * {@code TelephonyManager.NETWORK_TYPE_*} constants.

     *

     * @hide

     */

    public static final int NETWORK_TYPE_5G_NSA = -2;



    private static boolean isKnownMatchRule(final int rule) {

        switch (rule) {
@@ -475,6 +484,9 @@ public class NetworkTemplate implements Parcelable { 
                return TelephonyManager.NETWORK_TYPE_LTE;

            case TelephonyManager.NETWORK_TYPE_NR:

                return TelephonyManager.NETWORK_TYPE_NR;

            // Virtual RAT type for 5G NSA mode, see {@link NetworkTemplate#NETWORK_TYPE_5G_NSA}.

            case NetworkTemplate.NETWORK_TYPE_5G_NSA:

                return NetworkTemplate.NETWORK_TYPE_5G_NSA;

            default:

                return TelephonyManager.NETWORK_TYPE_UNKNOWN;

        }

services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java

+14 −1
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 


package com.android.server.net;



import static android.net.NetworkTemplate.NETWORK_TYPE_5G_NSA;

import static android.net.NetworkTemplate.getCollapsedRatType;



import android.annotation.NonNull;

import android.content.Context;

import android.telephony.Annotation;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;
@@ -195,7 +197,18 @@ public class NetworkStatsSubscriptionsMonitor extends 


        @Override

        public void onServiceStateChanged(@NonNull ServiceState ss) {

            final int networkType = ss.getDataNetworkType();

            // 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 ? NETWORK_TYPE_5G_NSA : ss.getDataNetworkType());

            final int collapsedRatType = getCollapsedRatType(networkType);

            if (collapsedRatType == mLastCollapsedRatType) return;

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+11 −1
Original line number Diff line number Diff line
@@ -1145,6 +1145,15 @@ public class StatsPullAtomService extends SystemService { 


    private void addDataUsageBytesTransferAtoms(@NonNull NetworkStatsExt statsExt,

            @NonNull List<StatsEvent> pulledData) {



        // Workaround for 5G NSA mode, see {@link NetworkTemplate#NETWORK_TYPE_5G_NSA}.

        // 5G NSA mode means the primary cell is LTE with a secondary connection to an

        // NR cell. To mitigate risk, NetworkStats is currently storing this state as

        // a fake RAT type rather than storing the boolean separately.

        final boolean is5GNsa = statsExt.ratType == NetworkTemplate.NETWORK_TYPE_5G_NSA;

        // Report NR connected in 5G non-standalone mode, or if the RAT type is NR to begin with.

        final boolean isNR = is5GNsa || statsExt.ratType == TelephonyManager.NETWORK_TYPE_NR;



        final NetworkStats.Entry entry = new NetworkStats.Entry(); // for recycling

        for (int i = 0; i < statsExt.stats.size(); i++) {

            statsExt.stats.getValues(i, entry);
@@ -1156,7 +1165,7 @@ public class StatsPullAtomService extends SystemService { 
                    .writeLong(entry.rxPackets)

                    .writeLong(entry.txBytes)

                    .writeLong(entry.txPackets)

                    .writeInt(statsExt.ratType)

                    .writeInt(is5GNsa ? TelephonyManager.NETWORK_TYPE_LTE : statsExt.ratType)

                    // Fill information about subscription, these cannot be null since invalid data

                    // would be filtered when adding into subInfo list.

                    .writeString(statsExt.subInfo.mcc)
@@ -1165,6 +1174,7 @@ public class StatsPullAtomService extends SystemService { 
                    .writeInt(statsExt.subInfo.isOpportunistic

                            ? DATA_USAGE_BYTES_TRANSFER__OPPORTUNISTIC_DATA_SUB__OPPORTUNISTIC

                            : DATA_USAGE_BYTES_TRANSFER__OPPORTUNISTIC_DATA_SUB__NOT_OPPORTUNISTIC)

                    .writeBoolean(isNR)

                    .build();

            pulledData.add(e);

        }

tests/net/java/android/net/NetworkTemplateTest.kt

+5 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.net.NetworkStats.METERED_ALL 
import android.net.NetworkStats.ROAMING_ALL

import android.net.NetworkTemplate.MATCH_MOBILE

import android.net.NetworkTemplate.MATCH_WIFI

import android.net.NetworkTemplate.NETWORK_TYPE_5G_NSA

import android.net.NetworkTemplate.NETWORK_TYPE_ALL

import android.net.NetworkTemplate.buildTemplateMobileWithRatType

import android.telephony.TelephonyManager
@@ -145,11 +146,13 @@ class NetworkTemplateTest { 
        assertParcelSane(templateWifi, 8)

    }



    // Verify NETWORK_TYPE_ALL does not conflict with TelephonyManager#NETWORK_TYPE_* constants.

    // Verify NETWORK_TYPE_* constants in NetworkTemplate do not conflict with

    // TelephonyManager#NETWORK_TYPE_* constants.

    @Test

    fun testNetworkTypeAll() {

    fun testNetworkTypeConstants() {

        for (ratType in TelephonyManager.getAllNetworkTypes()) {

            assertNotEquals(NETWORK_TYPE_ALL, ratType)

            assertNotEquals(NETWORK_TYPE_5G_NSA, ratType)

        }

    }

}