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

Commit 1abb8de0 authored by Aaron Huang's avatar Aaron Huang Committed by android-build-merger
Browse files

Merge "Add TrafficStats methods to public APIs" 

am: 8aed6e69

Change-Id: Ifc4bd75a3d1fbafbe666842223c914ca9b42a6df
parents 1e2e0892 8aed6e69

api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -29024,12 +29024,14 @@ package android.net { 
    method public static long getMobileRxPackets();

    method public static long getMobileRxPackets();

    method public static long getMobileTxBytes();

    method public static long getMobileTxBytes();

    method public static long getMobileTxPackets();

    method public static long getMobileTxPackets();

    method public static long getRxPackets(@NonNull String);

    method public static int getThreadStatsTag();

    method public static int getThreadStatsTag();

    method public static int getThreadStatsUid();

    method public static int getThreadStatsUid();

    method public static long getTotalRxBytes();

    method public static long getTotalRxBytes();

    method public static long getTotalRxPackets();

    method public static long getTotalRxPackets();

    method public static long getTotalTxBytes();

    method public static long getTotalTxBytes();

    method public static long getTotalTxPackets();

    method public static long getTotalTxPackets();

    method public static long getTxPackets(@NonNull String);

    method public static long getUidRxBytes(int);

    method public static long getUidRxBytes(int);

    method public static long getUidRxPackets(int);

    method public static long getUidRxPackets(int);

    method @Deprecated public static long getUidTcpRxBytes(int);

    method @Deprecated public static long getUidTcpRxBytes(int);

core/java/android/net/TrafficStats.java

+19 −4
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.net;

package android.net;





import android.annotation.NonNull;

import android.annotation.SuppressLint;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.TestApi;
@@ -595,8 +596,15 @@ public class TrafficStats { 
        return total;

        return total;

    }

    }





    /** {@hide} */

    /**

    public static long getTxPackets(String iface) {

     * Return the number of packets transmitted on the specified interface since

     * device boot. Statistics are measured at the network layer, so both TCP and

     * UDP usage are included.

     *

     * @param iface The name of the interface.

     * @return The number of transmitted packets.

     */

    public static long getTxPackets(@NonNull String iface) {

        try {

        try {

            return getStatsService().getIfaceStats(iface, TYPE_TX_PACKETS);

            return getStatsService().getIfaceStats(iface, TYPE_TX_PACKETS);

        } catch (RemoteException e) {

        } catch (RemoteException e) {
@@ -604,8 +612,15 @@ public class TrafficStats { 
        }

        }

    }

    }





    /** {@hide} */

    /**

    public static long getRxPackets(String iface) {

     * Return the number of packets received on the specified interface since

     * device boot. Statistics are measured at the network layer, so both TCP

     * and UDP usage are included.

     *

     * @param iface The name of the interface.

     * @return The number of received packets.

     */

    public static long getRxPackets(@NonNull String iface) {

        try {

        try {

            return getStatsService().getIfaceStats(iface, TYPE_RX_PACKETS);

            return getStatsService().getIfaceStats(iface, TYPE_RX_PACKETS);

        } catch (RemoteException e) {

        } catch (RemoteException e) {