Merge "[MS59.3] Expose NetworkStatsDataMigrationUtils" am: 8de5088578 am: e156948ba1 am: ea3eef06bb am: 675c4de2c8

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

Change-Id: Ie96aa4f519816b3c76f6f9e4dc2400070f4d326b
This commit is contained in:
Junyu Lai
2022-01-29 05:26:20 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 11 deletions

View File

@@ -41,6 +41,7 @@ import android.net.NetworkStateSnapshot;
import android.net.NetworkTemplate;
import android.net.UnderlyingNetworkInfo;
import android.net.netstats.IUsageCallback;
import android.net.netstats.NetworkStatsDataMigrationUtils;
import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.net.netstats.provider.NetworkStatsProvider;
import android.os.Build;
@@ -126,17 +127,12 @@ public class NetworkStatsManager {
private final INetworkStatsService mService;
/**
* Type constants for reading different types of Data Usage.
* @deprecated Use {@link NetworkStatsDataMigrationUtils#PREFIX_XT}
* instead.
* @hide
*/
// @SystemApi(client = MODULE_LIBRARIES)
@Deprecated
public static final String PREFIX_DEV = "dev";
/** @hide */
public static final String PREFIX_XT = "xt";
/** @hide */
public static final String PREFIX_UID = "uid";
/** @hide */
public static final String PREFIX_UID_TAG = "uid_tag";
/** @hide */
public static final int FLAG_POLL_ON_OPEN = 1 << 0;