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

Commit f0d7d734 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Have buildTemplateMobileWithRatType take metered parameter" into... 

Merge "Have buildTemplateMobileWithRatType take metered parameter" into sc-v2-dev am: 1ceeaf0b am: fe0c27a4

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

Change-Id: Ic603b1c3db071588e57b83836350970315430436
parents 14402f79 fe0c27a4

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;
@@ -1348,7 +1349,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);

    }
@@ -1388,7 +1389,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) {