diff options
| author | Junyu Lai <junyulai@google.com> | 2022-01-25 01:08:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-25 01:08:05 +0000 |
| commit | c756efe7bd95d5fec228e4da901b90c5b8780f57 (patch) | |
| tree | 6b1e70571a23534014505c3c729dd70332ab7fea /core | |
| parent | 08b23493b5887ea7aa46c2cc8a842c3c46641746 (diff) | |
| parent | 513d8dd2ac4c8ce25dda56c56da5f8b8156cc473 (diff) | |
Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" am: 513d8dd2ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952099
Change-Id: I5d03886f8cb0831cd7629aa19d4a20d04bc68b96
Diffstat (limited to 'core')
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/RuntimeInit.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 1dcb0c600adf..c2655878def2 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -368,6 +368,7 @@ package android.net { } public class TrafficStats { + method public static void attachSocketTagger(); method public static void init(@NonNull android.content.Context); } diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index 8d1f16b4b259..44c7f5406713 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -22,6 +22,7 @@ import android.app.ApplicationErrorReport; import android.app.IActivityManager; import android.compat.annotation.UnsupportedAppUsage; import android.content.type.DefaultMimeMapFactory; +import android.net.TrafficStats; import android.os.Build; import android.os.DeadObjectException; import android.os.IBinder; @@ -32,7 +33,6 @@ import android.util.Log; import android.util.Slog; import com.android.internal.logging.AndroidConfig; -import com.android.server.NetworkManagementSocketTagger; import dalvik.system.RuntimeHooks; import dalvik.system.VMRuntime; @@ -254,7 +254,7 @@ public class RuntimeInit { /* * Wire socket tagging to traffic stats. */ - NetworkManagementSocketTagger.install(); + TrafficStats.attachSocketTagger(); initialized = true; } |