Merge "Adjust map names due to new bpfloader"

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.Nullable;

import libcore.io.IoUtils;

import java.io.BufferedReader;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileReader;

import java.io.IOException;

import java.net.ProtocolException;

import java.util.Arrays;

    }

    public NetworkStatsFactory() {

        this(new File("/proc/"), new File("/sys/fs/bpf/traffic_uid_stats_map").exists());

        this(new File("/proc/"), new File("/sys/fs/bpf/map_netd_app_uid_stats_map").exists());

    }

    @VisibleForTesting

        mStatsObservers = checkNotNull(statsObservers, "missing NetworkStatsObservers");

        mSystemDir = checkNotNull(systemDir, "missing systemDir");

        mBaseDir = checkNotNull(baseDir, "missing baseDir");

        mUseBpfTrafficStats = new File("/sys/fs/bpf/traffic_uid_stats_map").exists();

        mUseBpfTrafficStats = new File("/sys/fs/bpf/map_netd_app_uid_stats_map").exists();

    }

    private void registerLocalService() {