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

Commit f4c10e8b authored by Varun Anand's avatar Varun Anand Committed by Gerrit Code Review
Browse files

Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 

* changes:
  Remove VPN info arrays from NetworkStats(Observer|Recorder)
  NetworkStatsFactory: Take VPNs into account for network/battery stats
  Remove duplicate line in clat_simple test file
  Remove unused lastStats parameter
  Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
parents 4e8973e9 833603ca

core/java/android/net/INetworkStatsService.aidl

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ interface INetworkStatsService { 
    /** Force update of ifaces. */

    void forceUpdateIfaces(

         in Network[] defaultNetworks,

         in VpnInfo[] vpnArray,

         in NetworkState[] networkStates,

         in String activeIface);

    /** Force update of statistics. */

core/java/android/net/NetworkStats.java

+232 −126

File changed.

Preview size limit exceeded, changes collapsed.

core/java/com/android/internal/net/VpnInfo.java

+6 −4
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.internal.net; 
import android.os.Parcel;

import android.os.Parcelable;



import java.util.Arrays;



/**

 * A lightweight container used to carry information of the ongoing VPN.

 * Internal use only..
@@ -28,14 +30,14 @@ import android.os.Parcelable; 
public class VpnInfo implements Parcelable {

    public int ownerUid;

    public String vpnIface;

    public String primaryUnderlyingIface;

    public String[] underlyingIfaces;



    @Override

    public String toString() {

        return "VpnInfo{"

                + "ownerUid=" + ownerUid

                + ", vpnIface='" + vpnIface + '\''

                + ", primaryUnderlyingIface='" + primaryUnderlyingIface + '\''

                + ", underlyingIfaces='" + Arrays.toString(underlyingIfaces) + '\''

                + '}';

    }
@@ -48,7 +50,7 @@ public class VpnInfo implements Parcelable { 
    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(ownerUid);

        dest.writeString(vpnIface);

        dest.writeString(primaryUnderlyingIface);

        dest.writeStringArray(underlyingIfaces);

    }



    public static final Parcelable.Creator<VpnInfo> CREATOR = new Parcelable.Creator<VpnInfo>() {
@@ -57,7 +59,7 @@ public class VpnInfo implements Parcelable { 
            VpnInfo info = new VpnInfo();

            info.ownerUid = source.readInt();

            info.vpnIface = source.readString();

            info.primaryUnderlyingIface = source.readString();

            info.underlyingIfaces = source.readStringArray();

            return info;

        }

core/tests/benchmarks/src/android/net/NetworkStatsBenchmark.java

+41 −13

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/ConnectivityService.java

+30 −12

File changed.

Preview size limit exceeded, changes collapsed.