commit 5a8ca580b078c7335d8ee384dd93dc86663d8d53
author Alon Albert <aalbert@google.com> Tue Jul 19 22:06:34 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 19 22:06:34 2011 -0700
tree 1f1c76e5bb7a5a67e6082594752ea01dba6ed10c
parent 060e3cad11541bc534ead73dae5c23ef242060cd
parent eaef351afcd586d5a84e80455f12f72fd12213ef

Merge "Add a getter for the active tag"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 708e035..72cfe71 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11291,6 +11291,7 @@
     method public static long getMobileRxPackets();
     method public static long getMobileTxBytes();
     method public static long getMobileTxPackets();
+    method public static int getThreadStatsTag();
     method public static long getTotalRxBytes();
     method public static long getTotalRxPackets();
     method public static long getTotalTxBytes();

core/java/android/net/TrafficStats.java

diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java
index 2b59dba..e054930 100644
--- a/core/java/android/net/TrafficStats.java
+++ b/core/java/android/net/TrafficStats.java
@@ -97,6 +97,15 @@
     }
 
     /**
+     * Get the active tag used when accounting {@link Socket} traffic originating
+     * from the current thread. Only one active tag per thread is supported.
+     * {@link #tagSocket(Socket)}.
+     */
+    public static int getThreadStatsTag() {
+        return NetworkManagementSocketTagger.getThreadSocketStatsTag();
+    }
+
+    /**
      * @deprecated unsupported, will eventually be removed
      */
     @Deprecated

core/java/com/android/server/NetworkManagementSocketTagger.java

diff --git a/core/java/com/android/server/NetworkManagementSocketTagger.java b/core/java/com/android/server/NetworkManagementSocketTagger.java
index c446cfb..59bef92 100644
--- a/core/java/com/android/server/NetworkManagementSocketTagger.java
+++ b/core/java/com/android/server/NetworkManagementSocketTagger.java
@@ -18,8 +18,8 @@
 
 import android.os.SystemProperties;
 import android.util.Log;
-
 import dalvik.system.SocketTagger;
+import libcore.io.IoUtils;
 
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
@@ -28,8 +28,6 @@
 import java.net.SocketException;
 import java.nio.charset.Charsets;
 
-import libcore.io.IoUtils;
-
 /**
  * Assigns tags to sockets for traffic stats.
  */
@@ -59,6 +57,10 @@
         threadSocketTags.get().statsTag = tag;
     }
 
+    public static int getThreadSocketStatsTag() {
+        return threadSocketTags.get().statsTag;
+    }
+
     public static void setThreadSocketStatsUid(int uid) {
         threadSocketTags.get().statsUid = uid;
     }