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

Commit f0d7633b authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Add tagging variants for DatagramSocket. 

Oops, we missed these along the way.

Bug: 25799174
Change-Id: I4ad368f9faee4b1996d605534dce4c2b23dbe200
parent d19c5c14

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22931,7 +22931,9 @@ package android.net { 
    method public static void incrementOperationCount(int);

    method public static void incrementOperationCount(int, int);

    method public static void setThreadStatsTag(int);

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

    method public static void tagSocket(java.net.Socket) throws java.net.SocketException;

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

    method public static void untagSocket(java.net.Socket) throws java.net.SocketException;

    field public static final int UNSUPPORTED = -1; // 0xffffffff

  }

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24518,7 +24518,9 @@ package android.net { 
    method public static void setThreadStatsTagBackup();

    method public static void setThreadStatsTagRestore();

    method public static void setThreadStatsUid(int);

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

    method public static void tagSocket(java.net.Socket) throws java.net.SocketException;

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

    method public static void untagSocket(java.net.Socket) throws java.net.SocketException;

    field public static final int UNSUPPORTED = -1; // 0xffffffff

  }

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22931,7 +22931,9 @@ package android.net { 
    method public static void incrementOperationCount(int);

    method public static void incrementOperationCount(int, int);

    method public static void setThreadStatsTag(int);

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

    method public static void tagSocket(java.net.Socket) throws java.net.SocketException;

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

    method public static void untagSocket(java.net.Socket) throws java.net.SocketException;

    field public static final int UNSUPPORTED = -1; // 0xffffffff

  }

core/java/android/net/TrafficStats.java

+22 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.server.NetworkManagementSocketTagger; 


import dalvik.system.SocketTagger;



import java.net.DatagramSocket;

import java.net.Socket;

import java.net.SocketException;
@@ -225,6 +226,27 @@ public class TrafficStats { 
        SocketTagger.get().untag(socket);

    }



    /**

     * Tag the given {@link DatagramSocket} with any statistics parameters

     * active for the current thread. Subsequent calls always replace any

     * existing parameters. When finished, call

     * {@link #untagDatagramSocket(DatagramSocket)} to remove statistics

     * parameters.

     *

     * @see #setThreadStatsTag(int)

     * @see #setThreadStatsUid(int)

     */

    public static void tagDatagramSocket(DatagramSocket socket) throws SocketException {

        SocketTagger.get().tag(socket);

    }



    /**

     * Remove any statistics parameters from the given {@link DatagramSocket}.

     */

    public static void untagDatagramSocket(DatagramSocket socket) throws SocketException {

        SocketTagger.get().untag(socket);

    }



    /**

     * Start profiling data usage for current UID. Only one profiling session

     * can be active at a time.