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

Commit bc8cdbee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ie15d4d9d2e8239f89d0561dd22863726d732ab3c
parents 105f98c3 81589202

packages/ConnectivityT/framework-t/Android.bp

+10 −4
Original line number Diff line number Diff line
@@ -25,15 +25,21 @@ filegroup { 
    name: "framework-connectivity-netstats-internal-sources",

    srcs: [

        "src/android/app/usage/*.java",

        "src/android/net/DataUsage*.*",

        "src/android/net/INetworkStats*.*",

        "src/android/net/NetworkIdentity*.java",

        "src/android/net/DataUsageRequest.*",

        "src/android/net/INetworkStatsService.aidl",

        "src/android/net/INetworkStatsSession.aidl",

        "src/android/net/NetworkIdentity.java",

        "src/android/net/NetworkIdentitySet.java",

        "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/TrafficStats.java",

        "src/android/net/UnderlyingNetworkInfo.*",

        "src/android/net/netstats/**/*.*",

        "src/com/android/server/NetworkManagementSocketTagger.java",

    ],

    path: "src",

    visibility: [

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

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server; 


import android.os.StrictMode;

import android.util.Log;

import android.util.Slog;



import dalvik.system.SocketTagger;
@@ -122,7 +121,7 @@ public final class NetworkManagementSocketTagger extends SocketTagger { 
    public static void resetKernelUidStats(int uid) {

        int errno = native_deleteTagData(0, uid);

        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);

        }

    }