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

Commit d3e4a1e2 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Track and persist in stats whether traffic is on the default network. 

This change adds the defaultNetwork to the ident based on current
system networking state, and persists that value to flash.

Bug: 35142602
Test: runtest frameworks-net
Test: downloaded files using default/non-default networks while watching dumpsys netstats
Change-Id: Id8776d149b2977548a9eb455ad4926af55e25aba
parent ada23ed5

core/java/android/net/NetworkIdentity.java

+19 −5
Original line number Diff line number Diff line
@@ -58,21 +58,24 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
    final String mNetworkId;

    final boolean mRoaming;

    final boolean mMetered;

    final boolean mDefaultNetwork;



    public NetworkIdentity(

            int type, int subType, String subscriberId, String networkId, boolean roaming,

            boolean metered) {

            boolean metered, boolean defaultNetwork) {

        mType = type;

        mSubType = COMBINE_SUBTYPE_ENABLED ? SUBTYPE_COMBINED : subType;

        mSubscriberId = subscriberId;

        mNetworkId = networkId;

        mRoaming = roaming;

        mMetered = metered;

        mDefaultNetwork = defaultNetwork;

    }



    @Override

    public int hashCode() {

        return Objects.hash(mType, mSubType, mSubscriberId, mNetworkId, mRoaming, mMetered);

        return Objects.hash(mType, mSubType, mSubscriberId, mNetworkId, mRoaming, mMetered,

                mDefaultNetwork);

    }



    @Override
@@ -82,7 +85,8 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
            return mType == ident.mType && mSubType == ident.mSubType && mRoaming == ident.mRoaming

                    && Objects.equals(mSubscriberId, ident.mSubscriberId)

                    && Objects.equals(mNetworkId, ident.mNetworkId)

                    && mMetered == ident.mMetered;

                    && mMetered == ident.mMetered

                    && mDefaultNetwork == ident.mDefaultNetwork;

        }

        return false;

    }
@@ -109,6 +113,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
            builder.append(", ROAMING");

        }

        builder.append(", metered=").append(mMetered);

        builder.append(", defaultNetwork=").append(mDefaultNetwork);

        return builder.append("}").toString();

    }
@@ -153,6 +158,10 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
        return mMetered;

    }



    public boolean getDefaultNetwork() {

        return mDefaultNetwork;

    }



    /**

     * Scrub given IMSI on production builds.

     */
@@ -183,7 +192,8 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
     * Build a {@link NetworkIdentity} from the given {@link NetworkState},

     * assuming that any mobile networks are using the current IMSI.

     */

    public static NetworkIdentity buildNetworkIdentity(Context context, NetworkState state) {

    public static NetworkIdentity buildNetworkIdentity(Context context, NetworkState state,

            boolean defaultNetwork) {

        final int type = state.networkInfo.getType();

        final int subType = state.networkInfo.getSubtype();
@@ -216,7 +226,8 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
            }

        }



        return new NetworkIdentity(type, subType, subscriberId, networkId, roaming, metered);

        return new NetworkIdentity(type, subType, subscriberId, networkId, roaming, metered,

                defaultNetwork);

    }



    @Override
@@ -237,6 +248,9 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
        if (res == 0) {

            res = Boolean.compare(mMetered, another.mMetered);

        }

        if (res == 0) {

            res = Boolean.compare(mDefaultNetwork, another.mDefaultNetwork);

        }

        return res;

    }

}

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

+26 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> implements 
    private static final int VERSION_ADD_ROAMING = 2;

    private static final int VERSION_ADD_NETWORK_ID = 3;

    private static final int VERSION_ADD_METERED = 4;

    private static final int VERSION_ADD_DEFAULT_NETWORK = 5;



    public NetworkIdentitySet() {

    }
@@ -76,12 +77,20 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> implements 
                metered = (type == TYPE_MOBILE);

            }



            add(new NetworkIdentity(type, subType, subscriberId, networkId, roaming, metered));

            final boolean defaultNetwork;

            if (version >= VERSION_ADD_DEFAULT_NETWORK) {

                defaultNetwork = in.readBoolean();

            } else {

                defaultNetwork = true;

            }



            add(new NetworkIdentity(type, subType, subscriberId, networkId, roaming, metered,

                    defaultNetwork));

        }

    }



    public void writeToStream(DataOutputStream out) throws IOException {

        out.writeInt(VERSION_ADD_METERED);

        out.writeInt(VERSION_ADD_DEFAULT_NETWORK);

        out.writeInt(size());

        for (NetworkIdentity ident : this) {

            out.writeInt(ident.getType());
@@ -90,6 +99,7 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> implements 
            writeOptionalString(out, ident.getNetworkId());

            out.writeBoolean(ident.getRoaming());

            out.writeBoolean(ident.getMetered());

            out.writeBoolean(ident.getDefaultNetwork());

        }

    }
@@ -119,6 +129,20 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> implements 
        return false;

    }



    /** @return whether any {@link NetworkIdentity} in this set is considered on the default

            network. */

    public boolean areAllMembersOnDefaultNetwork() {

        if (isEmpty()) {

            return true;

        }

        for (NetworkIdentity ident : this) {

            if (!ident.getDefaultNetwork()) {

                return false;

            }

        }

        return true;

    }



    private static void writeOptionalString(DataOutputStream out, String value) throws IOException {

        if (value != null) {

            out.writeByte(1);

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

+8 −5
Original line number Diff line number Diff line
@@ -1103,7 +1103,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            for (int subId : subIds) {

                final String subscriberId = tele.getSubscriberId(subId);

                final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,

                        TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true);

                        TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true,

                        true);

                if (template.matches(probeIdent)) {

                    return true;

                }
@@ -1304,7 +1305,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


        // find and update the mobile NetworkPolicy for this subscriber id

        final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,

                TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true);

                TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true, true);

        for (int i = mNetworkPolicy.size() - 1; i >= 0; i--) {

            final NetworkTemplate template = mNetworkPolicy.keyAt(i);

            if (template.matches(probeIdent)) {
@@ -1511,7 +1512,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            for (int subId : subIds) {

                final String subscriberId = tm.getSubscriberId(subId);

                final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,

                        TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true);

                        TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true,

                        true);

                // Template is matched when subscriber id matches.

                if (template.matches(probeIdent)) {

                    tm.setPolicyDataEnabled(enabled, subId);
@@ -1557,7 +1559,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        final ArrayMap<NetworkState, NetworkIdentity> identified = new ArrayMap<>();

        for (NetworkState state : states) {

            if (state.networkInfo != null && state.networkInfo.isConnected()) {

                final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);

                final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state,

                        true);

                identified.put(state, ident);

            }

        }
@@ -1692,7 +1695,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    private boolean ensureActiveMobilePolicyAL(int subId, String subscriberId) {

        // Poke around to see if we already have a policy

        final NetworkIdentity probeIdent = new NetworkIdentity(TYPE_MOBILE,

                TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true);

                TelephonyManager.NETWORK_TYPE_UNKNOWN, subscriberId, null, false, true, true);

        for (int i = mNetworkPolicy.size() - 1; i >= 0; i--) {

            final NetworkTemplate template = mNetworkPolicy.keyAt(i);

            if (template.matches(probeIdent)) {

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

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.net;



import static android.net.NetworkStats.IFACE_ALL;

import static android.net.NetworkStats.DEFAULT_NETWORK_NO;

import static android.net.NetworkStats.DEFAULT_NETWORK_YES;

import static android.net.NetworkStats.METERED_NO;

import static android.net.NetworkStats.METERED_YES;
@@ -365,7 +366,8 @@ public class NetworkStatsCollection implements FileRotator.Reader { 
                entry.uid = key.uid;

                entry.set = key.set;

                entry.tag = key.tag;

                entry.defaultNetwork = DEFAULT_NETWORK_YES;

                entry.defaultNetwork = key.ident.areAllMembersOnDefaultNetwork() ?

                        DEFAULT_NETWORK_YES : DEFAULT_NETWORK_NO;

                entry.metered = key.ident.isAnyMemberMetered() ? METERED_YES : METERED_NO;

                entry.roaming = key.ident.isAnyMemberRoaming() ? ROAMING_YES : ROAMING_NO;

                entry.rxBytes = historyEntry.rxBytes;

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

+5 −2
Original line number Diff line number Diff line
@@ -1061,7 +1061,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        for (NetworkState state : states) {

            if (state.networkInfo.isConnected()) {

                final boolean isMobile = isNetworkTypeMobile(state.networkInfo.getType());

                final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);

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

                final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state,

                        isDefault);



                // Traffic occurring on the base interface is always counted for

                // both total usage and UID details.
@@ -1081,7 +1083,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
                        // Copy the identify from IMS one but mark it as metered.

                        NetworkIdentity vtIdent = new NetworkIdentity(ident.getType(),

                                ident.getSubType(), ident.getSubscriberId(), ident.getNetworkId(),

                                ident.getRoaming(), true);

                                ident.getRoaming(), true /* metered */,

                                true /* onDefaultNetwork */);

                        findOrCreateNetworkIdentitySet(mActiveIfaces, VT_INTERFACE).add(vtIdent);

                        findOrCreateNetworkIdentitySet(mActiveUidIfaces, VT_INTERFACE).add(vtIdent);

                    }