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

Commit f4b07b9b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Rename API to match StorageStats." into oc-mr1-dev am: 74f7a142 

am: 6099e1c1

Change-Id: I8241dc312a087cb84e5d51fd6db5aeced5e87a2c
parents 896f80d5 6099e1c1

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -28250,8 +28250,8 @@ package android.net { 
    method public static void incrementOperationCount(int);

    method public static void incrementOperationCount(int);

    method public static void incrementOperationCount(int, int);

    method public static void incrementOperationCount(int, int);

    method public static void setThreadStatsTag(int);

    method public static void setThreadStatsTag(int);

    method public static void setThreadStatsTagApp();

    method public static void setThreadStatsTagBackup();

    method public static void setThreadStatsTagBackup();

    method public static void setThreadStatsTagCode();

    method public static void setThreadStatsTagRestore();

    method public static void setThreadStatsTagRestore();

    method public static void setThreadStatsUid(int);

    method public static void setThreadStatsUid(int);

    method public static void tagDatagramSocket(java.net.DatagramSocket) throws java.net.SocketException;

    method public static void tagDatagramSocket(java.net.DatagramSocket) throws java.net.SocketException;

core/java/android/net/TrafficStats.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -110,12 +110,12 @@ public class TrafficStats { 
    public static final int TAG_SYSTEM_RESTORE = 0xFFFFFF04;

    public static final int TAG_SYSTEM_RESTORE = 0xFFFFFF04;





    /**

    /**

     * Default tag value for code or resources downloaded by an app store on

     * Default tag value for code (typically APKs) downloaded by an app store on

     * behalf of the app, such as app updates.

     * behalf of the app, such as updates.

     *

     *

     * @hide

     * @hide

     */

     */

    public static final int TAG_SYSTEM_CODE = 0xFFFFFF05;

    public static final int TAG_SYSTEM_APP = 0xFFFFFF05;





    /** @hide */

    /** @hide */

    public static final int TAG_SYSTEM_DHCP = 0xFFFFFF40;

    public static final int TAG_SYSTEM_DHCP = 0xFFFFFF40;
@@ -213,14 +213,14 @@ public class TrafficStats { 
    /**

    /**

     * Set active tag to use when accounting {@link Socket} traffic originating

     * Set active tag to use when accounting {@link Socket} traffic originating

     * from the current thread. The tag used internally is well-defined to

     * from the current thread. The tag used internally is well-defined to

     * distinguish all code-related traffic, such as updates performed by an app

     * distinguish all code (typically APKs) downloaded by an app store on

     * store.

     * behalf of the app, such as updates.

     *

     *

     * @hide

     * @hide

     */

     */

    @SystemApi

    @SystemApi

    public static void setThreadStatsTagCode() {

    public static void setThreadStatsTagApp() {

        setThreadStatsTag(TAG_SYSTEM_CODE);

        setThreadStatsTag(TAG_SYSTEM_APP);

    }

    }





    /**

    /**