Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency"

  }

  public class TrafficStats {

    method public static void attachSocketTagger();

    method public static void init(@NonNull android.content.Context);

  }

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;

import android.util.Slog;

import com.android.internal.logging.AndroidConfig;

import com.android.server.NetworkManagementSocketTagger;

import dalvik.system.RuntimeHooks;

import dalvik.system.VMRuntime;

        /*

         * Wire socket tagging to traffic stats.

         */

        NetworkManagementSocketTagger.install();

        TrafficStats.attachSocketTagger();

        initialized = true;

    }

package android.net;

import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;

import android.annotation.NonNull;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

        sStatsService = statsManager.getBinder();

    }

    /**

     * Attach the socket tagger implementation to the current process, to

     * get notified when a socket's {@link FileDescriptor} is assigned to

     * a thread. See {@link SocketTagger#set(SocketTagger)}.

     *

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static void attachSocketTagger() {

        NetworkManagementSocketTagger.install();

    }

    /**

     * Set active tag to use when accounting {@link Socket} traffic originating

     * from the current thread. Only one active tag per thread is supported.