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

Commit 1c4d67b3 authored by Aaron Huang's avatar Aaron Huang Committed by Gerrit Code Review
Browse files

Merge "Have buildTemplateMobileWithRatType take metered parameter"

parents 0d9d449b 4f3a4253

core/java/android/net/NetworkTemplate.java

+6 −6
Original line number Diff line number Diff line
@@ -160,19 +160,19 @@ public class NetworkTemplate implements Parcelable { 
    }



    /**

     * Template to match cellular networks with the given IMSI and {@code ratType}.

     * Use {@link #NETWORK_TYPE_ALL} to include all network types when filtering.

     * See {@code TelephonyManager.NETWORK_TYPE_*}.

     * Template to match cellular networks with the given IMSI, {@code ratType} and

     * {@code metered}. Use {@link #NETWORK_TYPE_ALL} to include all network types when

     * filtering. See {@code TelephonyManager.NETWORK_TYPE_*}.

     */

    public static NetworkTemplate buildTemplateMobileWithRatType(@Nullable String subscriberId,

            @NetworkType int ratType) {

            @NetworkType int ratType, int metered) {

        if (TextUtils.isEmpty(subscriberId)) {

            return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null, null, null,

                    METERED_YES, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL,

                    metered, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL,

                    SUBSCRIBER_ID_MATCH_RULE_EXACT);

        }

        return new NetworkTemplate(MATCH_MOBILE, subscriberId, new String[]{subscriberId}, null,

                METERED_YES, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL,

                metered, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL,

                SUBSCRIBER_ID_MATCH_RULE_EXACT);

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static android.net.NetworkIdentity.OEM_PAID; 
import static android.net.NetworkIdentity.OEM_PRIVATE;

import static android.net.NetworkStats.DEFAULT_NETWORK_ALL;

import static android.net.NetworkStats.METERED_ALL;

import static android.net.NetworkStats.METERED_YES;

import static android.net.NetworkStats.ROAMING_ALL;

import static android.net.NetworkTemplate.MATCH_ETHERNET;

import static android.net.NetworkTemplate.MATCH_MOBILE_WILDCARD;
@@ -1340,7 +1341,7 @@ public class StatsPullAtomService extends SystemService { 
    @Nullable private NetworkStats getUidNetworkStatsSnapshotForTransport(int transport) {

        final NetworkTemplate template = (transport == TRANSPORT_CELLULAR)

                ? NetworkTemplate.buildTemplateMobileWithRatType(

                /*subscriptionId=*/null, NETWORK_TYPE_ALL)

                /*subscriptionId=*/null, NETWORK_TYPE_ALL, METERED_YES)

                : NetworkTemplate.buildTemplateWifiWildcard();

        return getUidNetworkStatsSnapshotForTemplate(template, /*includeTags=*/false);

    }
@@ -1380,7 +1381,8 @@ public class StatsPullAtomService extends SystemService { 
        final List<NetworkStatsExt> ret = new ArrayList<>();

        for (final int ratType : getAllCollapsedRatTypes()) {

            final NetworkTemplate template =

                    buildTemplateMobileWithRatType(subInfo.subscriberId, ratType);

                    buildTemplateMobileWithRatType(subInfo.subscriberId, ratType,

                    METERED_YES);

            final NetworkStats stats =

                    getUidNetworkStatsSnapshotForTemplate(template, /*includeTags=*/false);

            if (stats != null) {