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

Commit 3b7a716b authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS" am: 874aefac am: 1efa411e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I562f3152c1c9f5b360dc7206b888b93d058fe162
parents 245befad 1efa411e

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

+4 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.content.Intent.ACTION_UID_REMOVED; 
import static android.content.Intent.ACTION_USER_REMOVED;

import static android.content.Intent.EXTRA_UID;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.net.ConnectivityManager.isNetworkTypeMobile;

import static android.net.NetworkIdentity.SUBTYPE_COMBINED;

import static android.net.NetworkStack.checkNetworkStackPermission;

import static android.net.NetworkStats.DEFAULT_NETWORK_ALL;
@@ -71,6 +70,7 @@ import static android.text.format.DateUtils.HOUR_IN_MILLIS; 
import static android.text.format.DateUtils.MINUTE_IN_MILLIS;

import static android.text.format.DateUtils.SECOND_IN_MILLIS;



import static com.android.net.module.util.NetworkCapabilitiesUtils.getDisplayTransport;

import static com.android.server.NetworkManagementService.LIMIT_GLOBAL_ALERT;

import static com.android.server.NetworkManagementSocketTagger.resetKernelUidStats;

import static com.android.server.NetworkManagementSocketTagger.setKernelCounterSet;
@@ -1291,7 +1291,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        final boolean combineSubtypeEnabled = mSettings.getCombineSubtypeEnabled();

        final ArraySet<String> mobileIfaces = new ArraySet<>();

        for (NetworkStateSnapshot snapshot : snapshots) {

            final boolean isMobile = isNetworkTypeMobile(snapshot.legacyType);

            final int displayTransport =

                    getDisplayTransport(snapshot.networkCapabilities.getTransportTypes());

            final boolean isMobile = (NetworkCapabilities.TRANSPORT_CELLULAR == displayTransport);

            final boolean isDefault = ArrayUtils.contains(mDefaultNetworks, snapshot.network);

            final int subType = combineSubtypeEnabled ? SUBTYPE_COMBINED

                    : getSubTypeForStateSnapshot(snapshot);