diff options
| author | Alon Albert <aalbert@google.com> | 2011-07-19 22:06:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-19 22:06:34 -0700 |
| commit | 5a8ca580b078c7335d8ee384dd93dc86663d8d53 (patch) | |
| tree | 1f1c76e5bb7a5a67e6082594752ea01dba6ed10c /core | |
| parent | 060e3cad11541bc534ead73dae5c23ef242060cd (diff) | |
| parent | eaef351afcd586d5a84e80455f12f72fd12213ef (diff) | |
| download | frameworks_base-5a8ca580b078c7335d8ee384dd93dc86663d8d53.zip frameworks_base-5a8ca580b078c7335d8ee384dd93dc86663d8d53.tar.gz frameworks_base-5a8ca580b078c7335d8ee384dd93dc86663d8d53.tar.bz2 | |
Merge "Add a getter for the active tag"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/TrafficStats.java | 9 | ||||
| -rw-r--r-- | core/java/com/android/server/NetworkManagementSocketTagger.java | 8 |
2 files changed, 14 insertions, 3 deletions
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 @@ public class TrafficStats { } /** + * 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 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 @@ package com.android.server; 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.math.BigInteger; import java.net.SocketException; import java.nio.charset.Charsets; -import libcore.io.IoUtils; - /** * Assigns tags to sockets for traffic stats. */ @@ -59,6 +57,10 @@ public final class NetworkManagementSocketTagger extends SocketTagger { threadSocketTags.get().statsTag = tag; } + public static int getThreadSocketStatsTag() { + return threadSocketTags.get().statsTag; + } + public static void setThreadSocketStatsUid(int uid) { threadSocketTags.get().statsUid = uid; } |