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

Commit d69de5ec authored by Xiaolu Zeng's avatar Xiaolu Zeng Committed by Automerger Merge Worker
Browse files

Merge "Modify StatsPullAtomService: Log network type in WW tagged traffic... 

Merge "Modify StatsPullAtomService: Log network type in WW tagged traffic data." into main am: 731829ec am: a42569ab am: 7f3ad22a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776647



Change-Id: If20a9dd12b17064c1ca2815e165e3fb822118445
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c732a142 7f3ad22a

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

+8 −1
Original line number Diff line number Diff line
@@ -1281,12 +1281,19 @@ public class StatsPullAtomService extends SystemService { 


    private void addBytesTransferByTagAndMeteredAtoms(@NonNull NetworkStatsExt statsExt,

            @NonNull List<StatsEvent> pulledData) {

        // Workaround for 5G NSA mode, see {@link NetworkStatsManager#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 == NetworkStatsManager.NETWORK_TYPE_5G_NSA;



        for (NetworkStats.Entry entry : statsExt.stats) {

            pulledData.add(FrameworkStatsLog.buildStatsEvent(

                    FrameworkStatsLog.BYTES_TRANSFER_BY_TAG_AND_METERED, entry.getUid(),

                    entry.getMetered() == NetworkStats.METERED_YES, entry.getTag(),

                    entry.getRxBytes(), entry.getRxPackets(), entry.getTxBytes(),

                    entry.getTxPackets()));

                    entry.getTxPackets(),

                    is5GNsa ? TelephonyManager.NETWORK_TYPE_LTE : statsExt.ratType));

        }

    }