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

Commit 485bf9f9 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Move kernelToTag to NetworkStatsFactory. am: 09d2a4b1 am: b9e2b370 am:... 

Move kernelToTag to NetworkStatsFactory. am: 09d2a4b1 am: b9e2b370 am: d967a2fa am: 7667882f

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

Change-Id: I0d7a250e321ff80dc4ab94c57c6fb9ea7c793677
parents d7a62ace 7667882f

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

+0 −13
Original line number Diff line number Diff line
@@ -111,19 +111,6 @@ public final class NetworkManagementSocketTagger extends SocketTagger { 
        public int statsUid = -1;

    }



    /**

     * Convert {@code /proc/} tag format to {@link Integer}. Assumes incoming

     * format like {@code 0x7fffffff00000000}.

     */

    public static int kernelToTag(String string) {

        int length = string.length();

        if (length > 10) {

            return Long.decode(string.substring(0, length - 8)).intValue();

        } else {

            return 0;

        }

    }



    private static native int native_tagSocketFd(FileDescriptor fd, int tag, int uid);

    private static native int native_untagSocketFd(FileDescriptor fd);

}

packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsFactory.java

+13 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import static android.net.NetworkStats.TAG_ALL; 
import static android.net.NetworkStats.TAG_NONE;

import static android.net.NetworkStats.UID_ALL;



import static com.android.server.NetworkManagementSocketTagger.kernelToTag;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;
@@ -469,6 +467,19 @@ public class NetworkStatsFactory { 
        }

    }



    /**

     * Convert {@code /proc/} tag format to {@link Integer}. Assumes incoming

     * format like {@code 0x7fffffff00000000}.

     */

    public static int kernelToTag(String string) {

        int length = string.length();

        if (length > 10) {

            return Long.decode(string.substring(0, length - 8)).intValue();

        } else {

            return 0;

        }

    }



    /**

     * Parse statistics from file into given {@link NetworkStats} object. Values

     * are expected to monotonically increase since device boot.