Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb am: cb6617a563

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I24ef55a8dc58e5917109c3993b02ddfe147e1064
This commit is contained in:
Treehugger Robot
2022-01-07 16:15:23 +00:00
committed by Automerger Merge Worker
parent 23e9f0b15a cb6617a563
commit 3fe0c62490
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/ConnectivityT/framework-t/Android.bp
View File

@@ -25,15 +25,21 @@ filegroup {
name: "framework-connectivity-netstats-internal-sources", name: "framework-connectivity-netstats-internal-sources",
srcs: [ srcs: [
"src/android/app/usage/*.java", "src/android/app/usage/*.java",
"src/android/net/DataUsage*.*", "src/android/net/DataUsageRequest.*",
"src/android/net/INetworkStats*.*", "src/android/net/INetworkStatsService.aidl",
"src/android/net/NetworkIdentity*.java", "src/android/net/INetworkStatsSession.aidl",
"src/android/net/NetworkIdentity.java",
"src/android/net/NetworkIdentitySet.java",
"src/android/net/NetworkStateSnapshot.*", "src/android/net/NetworkStateSnapshot.*",
"src/android/net/NetworkStats*.*", "src/android/net/NetworkStats.*",
"src/android/net/NetworkStatsAccess.*",
"src/android/net/NetworkStatsCollection.*",
"src/android/net/NetworkStatsHistory.*",
"src/android/net/NetworkTemplate.*", "src/android/net/NetworkTemplate.*",
"src/android/net/TrafficStats.java", "src/android/net/TrafficStats.java",
"src/android/net/UnderlyingNetworkInfo.*", "src/android/net/UnderlyingNetworkInfo.*",
"src/android/net/netstats/**/*.*", "src/android/net/netstats/**/*.*",
"src/com/android/server/NetworkManagementSocketTagger.java",
], ],
path: "src", path: "src",
visibility: [ visibility: [

3
core/java/com/android/server/NetworkManagementSocketTagger.java → packages/ConnectivityT/framework-t/src/com/android/server/NetworkManagementSocketTagger.java
View File

@@ -18,7 +18,6 @@ package com.android.server;
import android.os.StrictMode; import android.os.StrictMode;
import android.util.Log; import android.util.Log;
import android.util.Slog;
import dalvik.system.SocketTagger; import dalvik.system.SocketTagger;
@@ -122,7 +121,7 @@ public final class NetworkManagementSocketTagger extends SocketTagger {
public static void resetKernelUidStats(int uid) { public static void resetKernelUidStats(int uid) {
int errno = native_deleteTagData(0, uid); int errno = native_deleteTagData(0, uid);
if (errno < 0) { if (errno < 0) {
Slog.w(TAG, "problem clearing counters for uid " + uid + " : errno " + errno); Log.w(TAG, "problem clearing counters for uid " + uid + " : errno " + errno);
} }
} }