Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "ms52-movenetstats"

Browse Source 
* changes:
  Expose MATCH_PROXY as a module-lib API.
  Add setPollForce to module API
  Move networkstats JNI to connectivity module
  [MS54.1] Move NetworkStats to updatable sources
  [MS62.1] Start NetworkStatsService from the module
This commit is contained in:
Lorenzo Colitti
2022-02-28 05:32:23 +00:00
committed by Gerrit Code Review
parent f64547164a 9f4d51d040
commit a45c0d91fa
30 changed files with 108 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -564,6 +564,7 @@ stubs_defaults {
libs: [
"art.module.public.api",
"sdk_module-lib_current_framework-tethering",
"sdk_module-lib_current_framework-connectivity-tiramisu",
"sdk_public_current_framework-bluetooth",
// There are a few classes from modules used by the core that
// need to be resolved by metalava. We use a prebuilt stub of the

1
StubLibraries.bp
View File

@@ -250,6 +250,7 @@ java_library {
srcs: [":module-lib-api-stubs-docs-non-updatable"],
libs: [
"sdk_module-lib_current_framework-tethering",
"sdk_module-lib_current_framework-connectivity-tiramisu",
"sdk_public_current_framework-bluetooth",
// NOTE: The below can be removed once the prebuilt stub contains bluetooth.
"sdk_system_current_android",

176
boot/hiddenapi/hiddenapi-max-target-o.txt
View File

@@ -9315,78 +9315,6 @@ Landroid/app/usage/IUsageStatsManager;->setAppStandbyBucket(Ljava/lang/String;II
Landroid/app/usage/IUsageStatsManager;->setAppStandbyBuckets(Landroid/content/pm/ParceledListSlice;I)V
Landroid/app/usage/IUsageStatsManager;->unregisterAppUsageObserver(ILjava/lang/String;)V
Landroid/app/usage/IUsageStatsManager;->whitelistAppTemporarily(Ljava/lang/String;JI)V
Landroid/app/usage/NetworkStats$Bucket;->convertDefaultNetworkStatus(I)I
Landroid/app/usage/NetworkStats$Bucket;->convertMetered(I)I
Landroid/app/usage/NetworkStats$Bucket;->convertRoaming(I)I
Landroid/app/usage/NetworkStats$Bucket;->convertSet(I)I
Landroid/app/usage/NetworkStats$Bucket;->convertState(I)I
Landroid/app/usage/NetworkStats$Bucket;->convertTag(I)I
Landroid/app/usage/NetworkStats$Bucket;->convertUid(I)I
Landroid/app/usage/NetworkStats$Bucket;->mBeginTimeStamp:J
Landroid/app/usage/NetworkStats$Bucket;->mDefaultNetworkStatus:I
Landroid/app/usage/NetworkStats$Bucket;->mEndTimeStamp:J
Landroid/app/usage/NetworkStats$Bucket;->mMetered:I
Landroid/app/usage/NetworkStats$Bucket;->mRoaming:I
Landroid/app/usage/NetworkStats$Bucket;->mRxBytes:J
Landroid/app/usage/NetworkStats$Bucket;->mRxPackets:J
Landroid/app/usage/NetworkStats$Bucket;->mState:I
Landroid/app/usage/NetworkStats$Bucket;->mTag:I
Landroid/app/usage/NetworkStats$Bucket;->mTxBytes:J
Landroid/app/usage/NetworkStats$Bucket;->mTxPackets:J
Landroid/app/usage/NetworkStats$Bucket;->mUid:I
Landroid/app/usage/NetworkStats;-><init>(Landroid/content/Context;Landroid/net/NetworkTemplate;IJJLandroid/net/INetworkStatsService;)V
Landroid/app/usage/NetworkStats;->fillBucketFromSummaryEntry(Landroid/app/usage/NetworkStats$Bucket;)V
Landroid/app/usage/NetworkStats;->getDeviceSummaryForNetwork()Landroid/app/usage/NetworkStats$Bucket;
Landroid/app/usage/NetworkStats;->getNextHistoryBucket(Landroid/app/usage/NetworkStats$Bucket;)Z
Landroid/app/usage/NetworkStats;->getNextSummaryBucket(Landroid/app/usage/NetworkStats$Bucket;)Z
Landroid/app/usage/NetworkStats;->getSummaryAggregate()Landroid/app/usage/NetworkStats$Bucket;
Landroid/app/usage/NetworkStats;->getUid()I
Landroid/app/usage/NetworkStats;->hasNextUid()Z
Landroid/app/usage/NetworkStats;->isUidEnumeration()Z
Landroid/app/usage/NetworkStats;->mCloseGuard:Ldalvik/system/CloseGuard;
Landroid/app/usage/NetworkStats;->mEndTimeStamp:J
Landroid/app/usage/NetworkStats;->mEnumerationIndex:I
Landroid/app/usage/NetworkStats;->mHistory:Landroid/net/NetworkStatsHistory;
Landroid/app/usage/NetworkStats;->mRecycledHistoryEntry:Landroid/net/NetworkStatsHistory$Entry;
Landroid/app/usage/NetworkStats;->mRecycledSummaryEntry:Landroid/net/NetworkStats$Entry;
Landroid/app/usage/NetworkStats;->mSession:Landroid/net/INetworkStatsSession;
Landroid/app/usage/NetworkStats;->mStartTimeStamp:J
Landroid/app/usage/NetworkStats;->mState:I
Landroid/app/usage/NetworkStats;->mSummary:Landroid/net/NetworkStats;
Landroid/app/usage/NetworkStats;->mTag:I
Landroid/app/usage/NetworkStats;->mTemplate:Landroid/net/NetworkTemplate;
Landroid/app/usage/NetworkStats;->mUidOrUidIndex:I
Landroid/app/usage/NetworkStats;->mUids:[I
Landroid/app/usage/NetworkStats;->setSingleUidTagState(III)V
Landroid/app/usage/NetworkStats;->startHistoryEnumeration(III)V
Landroid/app/usage/NetworkStats;->startSummaryEnumeration()V
Landroid/app/usage/NetworkStats;->startUserUidEnumeration()V
Landroid/app/usage/NetworkStats;->stepHistory()V
Landroid/app/usage/NetworkStats;->stepUid()V
Landroid/app/usage/NetworkStats;->TAG:Ljava/lang/String;
Landroid/app/usage/NetworkStatsManager$CallbackHandler;-><init>(Landroid/os/Looper;ILjava/lang/String;Landroid/app/usage/NetworkStatsManager$UsageCallback;)V
Landroid/app/usage/NetworkStatsManager$CallbackHandler;->getObject(Landroid/os/Message;Ljava/lang/String;)Ljava/lang/Object;
Landroid/app/usage/NetworkStatsManager$CallbackHandler;->mCallback:Landroid/app/usage/NetworkStatsManager$UsageCallback;
Landroid/app/usage/NetworkStatsManager$CallbackHandler;->mNetworkType:I
Landroid/app/usage/NetworkStatsManager$CallbackHandler;->mSubscriberId:Ljava/lang/String;
Landroid/app/usage/NetworkStatsManager$UsageCallback;->request:Landroid/net/DataUsageRequest;
Landroid/app/usage/NetworkStatsManager;-><init>(Landroid/content/Context;Landroid/net/INetworkStatsService;)V
Landroid/app/usage/NetworkStatsManager;->CALLBACK_LIMIT_REACHED:I
Landroid/app/usage/NetworkStatsManager;->CALLBACK_RELEASED:I
Landroid/app/usage/NetworkStatsManager;->createTemplate(ILjava/lang/String;)Landroid/net/NetworkTemplate;
Landroid/app/usage/NetworkStatsManager;->DBG:Z
Landroid/app/usage/NetworkStatsManager;->FLAG_AUGMENT_WITH_SUBSCRIPTION_PLAN:I
Landroid/app/usage/NetworkStatsManager;->FLAG_POLL_FORCE:I
Landroid/app/usage/NetworkStatsManager;->FLAG_POLL_ON_OPEN:I
Landroid/app/usage/NetworkStatsManager;->mContext:Landroid/content/Context;
Landroid/app/usage/NetworkStatsManager;->mFlags:I
Landroid/app/usage/NetworkStatsManager;->MIN_THRESHOLD_BYTES:J
Landroid/app/usage/NetworkStatsManager;->mService:Landroid/net/INetworkStatsService;
Landroid/app/usage/NetworkStatsManager;->querySummaryForDevice(Landroid/net/NetworkTemplate;JJ)Landroid/app/usage/NetworkStats$Bucket;
Landroid/app/usage/NetworkStatsManager;->registerUsageCallback(Landroid/net/NetworkTemplate;IJLandroid/app/usage/NetworkStatsManager$UsageCallback;Landroid/os/Handler;)V
Landroid/app/usage/NetworkStatsManager;->setAugmentWithSubscriptionPlan(Z)V
Landroid/app/usage/NetworkStatsManager;->setPollOnOpen(Z)V
Landroid/app/usage/NetworkStatsManager;->TAG:Ljava/lang/String;
Landroid/app/usage/StorageStats;-><init>()V
Landroid/app/usage/StorageStats;-><init>(Landroid/os/Parcel;)V
Landroid/app/usage/StorageStats;->cacheBytes:J
@@ -35338,13 +35266,6 @@ Landroid/net/ConnectivityMetricsEvent;->transports:J
Landroid/net/Credentials;->gid:I
Landroid/net/Credentials;->pid:I
Landroid/net/Credentials;->uid:I
Landroid/net/DataUsageRequest;-><init>(ILandroid/net/NetworkTemplate;J)V
Landroid/net/DataUsageRequest;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/DataUsageRequest;->PARCELABLE_KEY:Ljava/lang/String;
Landroid/net/DataUsageRequest;->requestId:I
Landroid/net/DataUsageRequest;->REQUEST_ID_UNSET:I
Landroid/net/DataUsageRequest;->template:Landroid/net/NetworkTemplate;
Landroid/net/DataUsageRequest;->thresholdInBytes:J
Landroid/net/DhcpResults;->addDns(Ljava/lang/String;)Z
Landroid/net/DhcpResults;->clear()V
Landroid/net/DhcpResults;->CREATOR:Landroid/os/Parcelable$Creator;
@@ -35793,68 +35714,6 @@ Landroid/net/INetworkScoreService;->requestScores([Landroid/net/NetworkKey;)Z
Landroid/net/INetworkScoreService;->setActiveScorer(Ljava/lang/String;)Z
Landroid/net/INetworkScoreService;->unregisterNetworkScoreCache(ILandroid/net/INetworkScoreCache;)V
Landroid/net/INetworkScoreService;->updateScores([Landroid/net/ScoredNetwork;)Z
Landroid/net/INetworkStatsService$Stub$Proxy;->forceUpdate()V
Landroid/net/INetworkStatsService$Stub$Proxy;->forceUpdateIfaces([Landroid/net/Network;)V
Landroid/net/INetworkStatsService$Stub$Proxy;->getDataLayerSnapshotForUid(I)Landroid/net/NetworkStats;
Landroid/net/INetworkStatsService$Stub$Proxy;->getDetailedUidStats([Ljava/lang/String;)Landroid/net/NetworkStats;
Landroid/net/INetworkStatsService$Stub$Proxy;->getIfaceStats(Ljava/lang/String;I)J
Landroid/net/INetworkStatsService$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
Landroid/net/INetworkStatsService$Stub$Proxy;->getTotalStats(I)J
Landroid/net/INetworkStatsService$Stub$Proxy;->getUidStats(II)J
Landroid/net/INetworkStatsService$Stub$Proxy;->incrementOperationCount(III)V
Landroid/net/INetworkStatsService$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/net/INetworkStatsService$Stub$Proxy;->openSession()Landroid/net/INetworkStatsSession;
Landroid/net/INetworkStatsService$Stub$Proxy;->openSessionForUsageStats(ILjava/lang/String;)Landroid/net/INetworkStatsSession;
Landroid/net/INetworkStatsService$Stub$Proxy;->registerUsageCallback(Ljava/lang/String;Landroid/net/DataUsageRequest;Landroid/os/Messenger;Landroid/os/IBinder;)Landroid/net/DataUsageRequest;
Landroid/net/INetworkStatsService$Stub$Proxy;->unregisterUsageRequest(Landroid/net/DataUsageRequest;)V
Landroid/net/INetworkStatsService$Stub;-><init>()V
Landroid/net/INetworkStatsService$Stub;->DESCRIPTOR:Ljava/lang/String;
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_forceUpdate:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_forceUpdateIfaces:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_getDataLayerSnapshotForUid:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_getDetailedUidStats:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_getIfaceStats:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_getMobileIfaces:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_getTotalStats:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_getUidStats:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_incrementOperationCount:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_openSession:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_openSessionForUsageStats:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_registerUsageCallback:I
Landroid/net/INetworkStatsService$Stub;->TRANSACTION_unregisterUsageRequest:I
Landroid/net/INetworkStatsService;->forceUpdateIfaces([Landroid/net/Network;)V
Landroid/net/INetworkStatsService;->getDetailedUidStats([Ljava/lang/String;)Landroid/net/NetworkStats;
Landroid/net/INetworkStatsService;->getIfaceStats(Ljava/lang/String;I)J
Landroid/net/INetworkStatsService;->getTotalStats(I)J
Landroid/net/INetworkStatsService;->getUidStats(II)J
Landroid/net/INetworkStatsService;->incrementOperationCount(III)V
Landroid/net/INetworkStatsService;->registerUsageCallback(Ljava/lang/String;Landroid/net/DataUsageRequest;Landroid/os/Messenger;Landroid/os/IBinder;)Landroid/net/DataUsageRequest;
Landroid/net/INetworkStatsService;->unregisterUsageRequest(Landroid/net/DataUsageRequest;)V
Landroid/net/INetworkStatsSession$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/net/INetworkStatsSession$Stub$Proxy;->close()V
Landroid/net/INetworkStatsSession$Stub$Proxy;->getDeviceSummaryForNetwork(Landroid/net/NetworkTemplate;JJ)Landroid/net/NetworkStats;
Landroid/net/INetworkStatsSession$Stub$Proxy;->getHistoryForNetwork(Landroid/net/NetworkTemplate;I)Landroid/net/NetworkStatsHistory;
Landroid/net/INetworkStatsSession$Stub$Proxy;->getHistoryForUid(Landroid/net/NetworkTemplate;IIII)Landroid/net/NetworkStatsHistory;
Landroid/net/INetworkStatsSession$Stub$Proxy;->getHistoryIntervalForUid(Landroid/net/NetworkTemplate;IIIIJJ)Landroid/net/NetworkStatsHistory;
Landroid/net/INetworkStatsSession$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
Landroid/net/INetworkStatsSession$Stub$Proxy;->getRelevantUids()[I
Landroid/net/INetworkStatsSession$Stub$Proxy;->getSummaryForAllUid(Landroid/net/NetworkTemplate;JJZ)Landroid/net/NetworkStats;
Landroid/net/INetworkStatsSession$Stub$Proxy;->getSummaryForNetwork(Landroid/net/NetworkTemplate;JJ)Landroid/net/NetworkStats;
Landroid/net/INetworkStatsSession$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/net/INetworkStatsSession$Stub;-><init>()V
Landroid/net/INetworkStatsSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStatsSession;
Landroid/net/INetworkStatsSession$Stub;->DESCRIPTOR:Ljava/lang/String;
Landroid/net/INetworkStatsSession$Stub;->TRANSACTION_close:I
Landroid/net/INetworkStatsSession$Stub;->TRANSACTION_getDeviceSummaryForNetwork:I
Landroid/net/INetworkStatsSession$Stub;->TRANSACTION_getHistoryForNetwork:I
Landroid/net/INetworkStatsSession$Stub;->TRANSACTION_getHistoryForUid:I
Landroid/net/INetworkStatsSession$Stub;->TRANSACTION_getHistoryIntervalForUid:I
Landroid/net/INetworkStatsSession$Stub;->TRANSACTION_getRelevantUids:I
Landroid/net/INetworkStatsSession$Stub;->TRANSACTION_getSummaryForAllUid:I
Landroid/net/INetworkStatsSession$Stub;->TRANSACTION_getSummaryForNetwork:I
Landroid/net/INetworkStatsSession;->getDeviceSummaryForNetwork(Landroid/net/NetworkTemplate;JJ)Landroid/net/NetworkStats;
Landroid/net/INetworkStatsSession;->getHistoryIntervalForUid(Landroid/net/NetworkTemplate;IIIIJJ)Landroid/net/NetworkStatsHistory;
Landroid/net/INetworkStatsSession;->getRelevantUids()[I
Landroid/net/InterfaceConfiguration;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/InterfaceConfiguration;->FLAG_DOWN:Ljava/lang/String;
Landroid/net/InterfaceConfiguration;->FLAG_UP:Ljava/lang/String;
@@ -36529,41 +36388,6 @@ Landroid/net/SSLSessionCache;->TAG:Ljava/lang/String;
Landroid/net/StringNetworkSpecifier;-><init>(Ljava/lang/String;)V
Landroid/net/StringNetworkSpecifier;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/StringNetworkSpecifier;->satisfiedBy(Landroid/net/NetworkSpecifier;)Z
Landroid/net/TrafficStats;->addIfSupported(J)J
Landroid/net/TrafficStats;->closeQuietly(Landroid/net/INetworkStatsSession;)V
Landroid/net/TrafficStats;->GB_IN_BYTES:J
Landroid/net/TrafficStats;->getDataLayerSnapshotForUid(Landroid/content/Context;)Landroid/net/NetworkStats;
Landroid/net/TrafficStats;->getRxPackets(Ljava/lang/String;)J
Landroid/net/TrafficStats;->getTxPackets(Ljava/lang/String;)J
Landroid/net/TrafficStats;->KB_IN_BYTES:J
Landroid/net/TrafficStats;->LOOPBACK_IFACE:Ljava/lang/String;
Landroid/net/TrafficStats;->MB_IN_BYTES:J
Landroid/net/TrafficStats;->PB_IN_BYTES:J
Landroid/net/TrafficStats;->sActiveProfilingStart:Landroid/net/NetworkStats;
Landroid/net/TrafficStats;->sProfilingLock:Ljava/lang/Object;
Landroid/net/TrafficStats;->sStatsService:Landroid/net/INetworkStatsService;
Landroid/net/TrafficStats;->startDataProfiling(Landroid/content/Context;)V
Landroid/net/TrafficStats;->stopDataProfiling(Landroid/content/Context;)Landroid/net/NetworkStats;
Landroid/net/TrafficStats;->TAG_SYSTEM_APP:I
Landroid/net/TrafficStats;->TAG_SYSTEM_BACKUP:I
Landroid/net/TrafficStats;->TAG_SYSTEM_DHCP:I
Landroid/net/TrafficStats;->TAG_SYSTEM_DOWNLOAD:I
Landroid/net/TrafficStats;->TAG_SYSTEM_GPS:I
Landroid/net/TrafficStats;->TAG_SYSTEM_MEDIA:I
Landroid/net/TrafficStats;->TAG_SYSTEM_NEIGHBOR:I
Landroid/net/TrafficStats;->TAG_SYSTEM_NTP:I
Landroid/net/TrafficStats;->TAG_SYSTEM_PAC:I
Landroid/net/TrafficStats;->TAG_SYSTEM_PROBE:I
Landroid/net/TrafficStats;->TAG_SYSTEM_RESTORE:I
Landroid/net/TrafficStats;->TB_IN_BYTES:J
Landroid/net/TrafficStats;->TYPE_RX_BYTES:I
Landroid/net/TrafficStats;->TYPE_RX_PACKETS:I
Landroid/net/TrafficStats;->TYPE_TCP_RX_PACKETS:I
Landroid/net/TrafficStats;->TYPE_TCP_TX_PACKETS:I
Landroid/net/TrafficStats;->TYPE_TX_BYTES:I
Landroid/net/TrafficStats;->TYPE_TX_PACKETS:I
Landroid/net/TrafficStats;->UID_REMOVED:I
Landroid/net/TrafficStats;->UID_TETHERING:I
Landroid/net/Uri$AbstractHierarchicalUri;-><init>()V
Landroid/net/Uri$AbstractHierarchicalUri;->getUserInfoPart()Landroid/net/Uri$Part;
Landroid/net/Uri$AbstractHierarchicalUri;->host:Ljava/lang/String;

3
boot/hiddenapi/hiddenapi-unsupported.txt
View File

@@ -170,9 +170,6 @@ Landroid/media/tv/ITvRemoteProvider$Stub;-><init>()V
Landroid/net/INetworkManagementEventObserver$Stub;-><init>()V
Landroid/net/INetworkPolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkPolicyManager;
Landroid/net/INetworkScoreService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkScoreService;
Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/net/INetworkStatsService$Stub$Proxy;->getMobileIfaces()[Ljava/lang/String;
Landroid/net/INetworkStatsService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStatsService;
Landroid/os/IBatteryPropertiesRegistrar$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/os/IDeviceIdentifiersPolicyService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IDeviceIdentifiersPolicyService;
Landroid/os/IDeviceIdleController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IDeviceIdleController;

100
core/api/current.txt
View File

@@ -8339,62 +8339,6 @@ package android.app.usage {
field @NonNull public static final android.os.Parcelable.Creator<android.app.usage.ExternalStorageStats> CREATOR;
}
public final class NetworkStats implements java.lang.AutoCloseable {
method public void close();
method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket);
method public boolean hasNextBucket();
}
public static class NetworkStats.Bucket {
ctor public NetworkStats.Bucket();
method public int getDefaultNetworkStatus();
method public long getEndTimeStamp();
method public int getMetered();
method public int getRoaming();
method public long getRxBytes();
method public long getRxPackets();
method public long getStartTimeStamp();
method public int getState();
method public int getTag();
method public long getTxBytes();
method public long getTxPackets();
method public int getUid();
field public static final int DEFAULT_NETWORK_ALL = -1; // 0xffffffff
field public static final int DEFAULT_NETWORK_NO = 1; // 0x1
field public static final int DEFAULT_NETWORK_YES = 2; // 0x2
field public static final int METERED_ALL = -1; // 0xffffffff
field public static final int METERED_NO = 1; // 0x1
field public static final int METERED_YES = 2; // 0x2
field public static final int ROAMING_ALL = -1; // 0xffffffff
field public static final int ROAMING_NO = 1; // 0x1
field public static final int ROAMING_YES = 2; // 0x2
field public static final int STATE_ALL = -1; // 0xffffffff
field public static final int STATE_DEFAULT = 1; // 0x1
field public static final int STATE_FOREGROUND = 2; // 0x2
field public static final int TAG_NONE = 0; // 0x0
field public static final int UID_ALL = -1; // 0xffffffff
field public static final int UID_REMOVED = -4; // 0xfffffffc
field public static final int UID_TETHERING = -5; // 0xfffffffb
}
public class NetworkStatsManager {
method @WorkerThread public android.app.usage.NetworkStats queryDetails(int, String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
method @WorkerThread public android.app.usage.NetworkStats queryDetailsForUid(int, String, long, long, int) throws java.lang.SecurityException;
method @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTag(int, String, long, long, int, int) throws java.lang.SecurityException;
method @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTagState(int, String, long, long, int, int, int) throws java.lang.SecurityException;
method @WorkerThread public android.app.usage.NetworkStats querySummary(int, String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
method @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
method @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
method public void registerUsageCallback(int, String, long, android.app.usage.NetworkStatsManager.UsageCallback);
method public void registerUsageCallback(int, String, long, android.app.usage.NetworkStatsManager.UsageCallback, @Nullable android.os.Handler);
method public void unregisterUsageCallback(android.app.usage.NetworkStatsManager.UsageCallback);
}
public abstract static class NetworkStatsManager.UsageCallback {
ctor public NetworkStatsManager.UsageCallback();
method public abstract void onThresholdReached(int, String);
}
public final class StorageStats implements android.os.Parcelable {
method public int describeContents();
method public long getAppBytes();
@@ -25366,50 +25310,6 @@ package android.net {
method @NonNull public android.net.TelephonyNetworkSpecifier.Builder setSubscriptionId(int);
}
public class TrafficStats {
ctor public TrafficStats();
method public static void clearThreadStatsTag();
method public static void clearThreadStatsUid();
method public static int getAndSetThreadStatsTag(int);
method public static long getMobileRxBytes();
method public static long getMobileRxPackets();
method public static long getMobileTxBytes();
method public static long getMobileTxPackets();
method public static long getRxBytes(@NonNull String);
method public static long getRxPackets(@NonNull String);
method public static int getThreadStatsTag();
method public static int getThreadStatsUid();
method public static long getTotalRxBytes();
method public static long getTotalRxPackets();
method public static long getTotalTxBytes();
method public static long getTotalTxPackets();
method public static long getTxBytes(@NonNull String);
method public static long getTxPackets(@NonNull String);
method public static long getUidRxBytes(int);
method public static long getUidRxPackets(int);
method @Deprecated public static long getUidTcpRxBytes(int);
method @Deprecated public static long getUidTcpRxSegments(int);
method @Deprecated public static long getUidTcpTxBytes(int);
method @Deprecated public static long getUidTcpTxSegments(int);
method public static long getUidTxBytes(int);
method public static long getUidTxPackets(int);
method @Deprecated public static long getUidUdpRxBytes(int);
method @Deprecated public static long getUidUdpRxPackets(int);
method @Deprecated public static long getUidUdpTxBytes(int);
method @Deprecated public static long getUidUdpTxPackets(int);
method public static void incrementOperationCount(int);
method public static void incrementOperationCount(int, int);
method public static void setThreadStatsTag(int);
method public static void setThreadStatsUid(int);
method public static void tagDatagramSocket(java.net.DatagramSocket) throws java.net.SocketException;
method public static void tagFileDescriptor(java.io.FileDescriptor) throws java.io.IOException;
method public static void tagSocket(java.net.Socket) throws java.net.SocketException;
method public static void untagDatagramSocket(java.net.DatagramSocket) throws java.net.SocketException;
method public static void untagFileDescriptor(java.io.FileDescriptor) throws java.io.IOException;
method public static void untagSocket(java.net.Socket) throws java.net.SocketException;
field public static final int UNSUPPORTED = -1; // 0xffffffff
}
public abstract class Uri implements java.lang.Comparable<android.net.Uri> android.os.Parcelable {
method public abstract android.net.Uri.Builder buildUpon();
method public int compareTo(android.net.Uri);

154
core/api/module-lib-current.txt
View File

@@ -51,31 +51,6 @@ package android.app {
}
package android.app.usage {
public class NetworkStatsManager {
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void forceUpdate();
method public static int getCollapsedRatType(int);
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void notifyNetworkStatus(@NonNull java.util.List<android.net.Network>, @NonNull java.util.List<android.net.NetworkStateSnapshot>, @Nullable String, @NonNull java.util.List<android.net.UnderlyingNetworkInfo>);
method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForDevice(@NonNull android.net.NetworkTemplate, long, long);
method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTagState(@NonNull android.net.NetworkTemplate, long, long, int, int, int) throws java.lang.SecurityException;
method @NonNull @WorkerThread public android.app.usage.NetworkStats querySummary(@NonNull android.net.NetworkTemplate, long, long) throws java.lang.SecurityException;
method @NonNull @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForDevice(@NonNull android.net.NetworkTemplate, long, long);
method @NonNull @WorkerThread public android.app.usage.NetworkStats queryTaggedSummary(@NonNull android.net.NetworkTemplate, long, long) throws java.lang.SecurityException;
method public void registerUsageCallback(@NonNull android.net.NetworkTemplate, long, @NonNull java.util.concurrent.Executor, @NonNull android.app.usage.NetworkStatsManager.UsageCallback);
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setDefaultGlobalAlert(long);
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setPollOnOpen(boolean);
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setStatsProviderWarningAndLimitAsync(@NonNull String, long, long);
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void setUidForeground(int, boolean);
field public static final int NETWORK_TYPE_5G_NSA = -2; // 0xfffffffe
}
public abstract static class NetworkStatsManager.UsageCallback {
method public void onThresholdReached(@NonNull android.net.NetworkTemplate);
}
}
package android.content {
public abstract class ContentProvider implements android.content.ComponentCallbacks2 {
@@ -238,32 +213,6 @@ package android.net {
ctor public LocalSocket(@NonNull java.io.FileDescriptor);
}
public class NetworkIdentity {
method public int getOemManaged();
method public int getRatType();
method @Nullable public String getSubscriberId();
method public int getType();
method @Nullable public String getWifiNetworkKey();
method public boolean isDefaultNetwork();
method public boolean isMetered();
method public boolean isRoaming();
}
public static final class NetworkIdentity.Builder {
ctor public NetworkIdentity.Builder();
method @NonNull public android.net.NetworkIdentity build();
method @NonNull public android.net.NetworkIdentity.Builder clearRatType();
method @NonNull public android.net.NetworkIdentity.Builder setDefaultNetwork(boolean);
method @NonNull public android.net.NetworkIdentity.Builder setMetered(boolean);
method @NonNull public android.net.NetworkIdentity.Builder setNetworkStateSnapshot(@NonNull android.net.NetworkStateSnapshot);
method @NonNull public android.net.NetworkIdentity.Builder setOemManaged(int);
method @NonNull public android.net.NetworkIdentity.Builder setRatType(int);
method @NonNull public android.net.NetworkIdentity.Builder setRoaming(boolean);
method @NonNull public android.net.NetworkIdentity.Builder setSubscriberId(@Nullable String);
method @NonNull public android.net.NetworkIdentity.Builder setType(int);
method @NonNull public android.net.NetworkIdentity.Builder setWifiNetworkKey(@Nullable String);
}
public class NetworkPolicyManager {
method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public int getMultipathPreference(@NonNull android.net.Network);
method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public int getRestrictBackgroundStatus(int);
@@ -279,94 +228,6 @@ package android.net {
method public default void onUidBlockedReasonChanged(int, int);
}
public final class NetworkStateSnapshot implements android.os.Parcelable {
ctor public NetworkStateSnapshot(@NonNull android.net.Network, @NonNull android.net.NetworkCapabilities, @NonNull android.net.LinkProperties, @Nullable String, int);
method public int describeContents();
method public int getLegacyType();
method @NonNull public android.net.LinkProperties getLinkProperties();
method @NonNull public android.net.Network getNetwork();
method @NonNull public android.net.NetworkCapabilities getNetworkCapabilities();
method @Nullable public String getSubscriberId();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStateSnapshot> CREATOR;
}
public class NetworkStatsCollection {
method @NonNull public java.util.Map<android.net.NetworkStatsCollection.Key,android.net.NetworkStatsHistory> getEntries();
}
public static final class NetworkStatsCollection.Builder {
ctor public NetworkStatsCollection.Builder(long);
method @NonNull public android.net.NetworkStatsCollection.Builder addEntry(@NonNull android.net.NetworkStatsCollection.Key, @NonNull android.net.NetworkStatsHistory);
method @NonNull public android.net.NetworkStatsCollection build();
}
public static class NetworkStatsCollection.Key {
ctor public NetworkStatsCollection.Key(@NonNull java.util.Set<android.net.NetworkIdentity>, int, int, int);
}
public final class NetworkStatsHistory implements android.os.Parcelable {
method public int describeContents();
method @NonNull public java.util.List<android.net.NetworkStatsHistory.Entry> getEntries();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStatsHistory> CREATOR;
}
public static final class NetworkStatsHistory.Builder {
ctor public NetworkStatsHistory.Builder(long, int);
method @NonNull public android.net.NetworkStatsHistory.Builder addEntry(@NonNull android.net.NetworkStatsHistory.Entry);
method @NonNull public android.net.NetworkStatsHistory build();
}
public static final class NetworkStatsHistory.Entry {
ctor public NetworkStatsHistory.Entry(long, long, long, long, long, long, long);
method public long getActiveTime();
method public long getBucketStart();
method public long getOperations();
method public long getRxBytes();
method public long getRxPackets();
method public long getTxBytes();
method public long getTxPackets();
}
public final class NetworkTemplate implements android.os.Parcelable {
method public int describeContents();
method public int getDefaultNetworkStatus();
method public int getMatchRule();
method public int getMeteredness();
method public int getOemManaged();
method public int getRatType();
method public int getRoaming();
method @NonNull public java.util.Set<java.lang.String> getSubscriberIds();
method @NonNull public java.util.Set<java.lang.String> getWifiNetworkKeys();
method public boolean matches(@NonNull android.net.NetworkIdentity);
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkTemplate> CREATOR;
field public static final int MATCH_BLUETOOTH = 8; // 0x8
field public static final int MATCH_CARRIER = 10; // 0xa
field public static final int MATCH_ETHERNET = 5; // 0x5
field public static final int MATCH_MOBILE = 1; // 0x1
field public static final int MATCH_WIFI = 4; // 0x4
field public static final int NETWORK_TYPE_ALL = -1; // 0xffffffff
field public static final int OEM_MANAGED_ALL = -1; // 0xffffffff
field public static final int OEM_MANAGED_NO = 0; // 0x0
field public static final int OEM_MANAGED_PAID = 1; // 0x1
field public static final int OEM_MANAGED_PRIVATE = 2; // 0x2
field public static final int OEM_MANAGED_YES = -2; // 0xfffffffe
}
public static final class NetworkTemplate.Builder {
ctor public NetworkTemplate.Builder(int);
method @NonNull public android.net.NetworkTemplate build();
method @NonNull public android.net.NetworkTemplate.Builder setDefaultNetworkStatus(int);
method @NonNull public android.net.NetworkTemplate.Builder setMeteredness(int);
method @NonNull public android.net.NetworkTemplate.Builder setOemManaged(int);
method @NonNull public android.net.NetworkTemplate.Builder setRatType(int);
method @NonNull public android.net.NetworkTemplate.Builder setRoaming(int);
method @NonNull public android.net.NetworkTemplate.Builder setSubscriberIds(@NonNull java.util.Set<java.lang.String>);
method @NonNull public android.net.NetworkTemplate.Builder setWifiNetworkKeys(@NonNull java.util.Set<java.lang.String>);
}
public class NetworkWatchlistManager {
method @Nullable public byte[] getWatchlistConfigHash();
}
@@ -385,21 +246,6 @@ package android.net {
method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo);
}
public class TrafficStats {
method public static void attachSocketTagger();
method public static void init(@NonNull android.content.Context);
}
public final class UnderlyingNetworkInfo implements android.os.Parcelable {
ctor public UnderlyingNetworkInfo(int, @NonNull String, @NonNull java.util.List<java.lang.String>);
method public int describeContents();
method @NonNull public String getInterface();
method public int getOwnerUid();
method @NonNull public java.util.List<java.lang.String> getUnderlyingInterfaces();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.UnderlyingNetworkInfo> CREATOR;
}
public class VpnManager {
field public static final int TYPE_VPN_LEGACY = 3; // 0x3
field public static final int TYPE_VPN_NONE = -1; // 0xffffffff

4
core/api/removed.txt
View File

@@ -260,10 +260,6 @@ package android.net {
method @Deprecated public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
}
public class TrafficStats {
method @Deprecated public static void setThreadStatsUidSelf();
}
}
package android.os {

79
core/api/system-current.txt
View File

@@ -1852,13 +1852,6 @@ package android.app.usage {
field public static final String SERVICE_INTERFACE = "android.app.usage.CacheQuotaService";
}
public class NetworkStatsManager {
method @NonNull @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public android.net.NetworkStats getMobileUidStats();
method @NonNull @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public android.net.NetworkStats getWifiUidStats();
method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STATS_PROVIDER, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void registerNetworkStatsProvider(@NonNull String, @NonNull android.net.netstats.provider.NetworkStatsProvider);
method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STATS_PROVIDER, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void unregisterNetworkStatsProvider(@NonNull android.net.netstats.provider.NetworkStatsProvider);
}
public static final class UsageEvents.Event {
method public int getInstanceId();
method @Nullable public String getNotificationChannelId();
@@ -7115,48 +7108,6 @@ package android.net {
field public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK";
}
public final class NetworkStats implements java.lang.Iterable<android.net.NetworkStats.Entry> android.os.Parcelable {
ctor public NetworkStats(long, int);
method @NonNull public android.net.NetworkStats add(@NonNull android.net.NetworkStats);
method @NonNull public android.net.NetworkStats addEntry(@NonNull android.net.NetworkStats.Entry);
method public int describeContents();
method @NonNull public java.util.Iterator<android.net.NetworkStats.Entry> iterator();
method @NonNull public android.net.NetworkStats subtract(@NonNull android.net.NetworkStats);
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStats> CREATOR;
field public static final int DEFAULT_NETWORK_ALL = -1; // 0xffffffff
field public static final int DEFAULT_NETWORK_NO = 0; // 0x0
field public static final int DEFAULT_NETWORK_YES = 1; // 0x1
field public static final String IFACE_VT = "vt_data0";
field public static final int METERED_ALL = -1; // 0xffffffff
field public static final int METERED_NO = 0; // 0x0
field public static final int METERED_YES = 1; // 0x1
field public static final int ROAMING_ALL = -1; // 0xffffffff
field public static final int ROAMING_NO = 0; // 0x0
field public static final int ROAMING_YES = 1; // 0x1
field public static final int SET_ALL = -1; // 0xffffffff
field public static final int SET_DEFAULT = 0; // 0x0
field public static final int SET_FOREGROUND = 1; // 0x1
field public static final int TAG_NONE = 0; // 0x0
field public static final int UID_ALL = -1; // 0xffffffff
field public static final int UID_TETHERING = -5; // 0xfffffffb
}
public static class NetworkStats.Entry {
ctor public NetworkStats.Entry(@Nullable String, int, int, int, int, int, int, long, long, long, long, long);
method public int getDefaultNetwork();
method public int getMetered();
method public long getOperations();
method public int getRoaming();
method public long getRxBytes();
method public long getRxPackets();
method public int getSet();
method public int getTag();
method public long getTxBytes();
method public long getTxPackets();
method public int getUid();
}
public class RssiCurve implements android.os.Parcelable {
ctor public RssiCurve(int, int, byte[]);
ctor public RssiCurve(int, int, byte[], int);
@@ -7188,19 +7139,6 @@ package android.net {
field public final android.net.RssiCurve rssiCurve;
}
public class TrafficStats {
method public static void setThreadStatsTagApp();
method public static void setThreadStatsTagBackup();
method public static void setThreadStatsTagDownload();
method public static void setThreadStatsTagRestore();
field public static final int TAG_NETWORK_STACK_IMPERSONATION_RANGE_END = -113; // 0xffffff8f
field public static final int TAG_NETWORK_STACK_IMPERSONATION_RANGE_START = -128; // 0xffffff80
field public static final int TAG_NETWORK_STACK_RANGE_END = -257; // 0xfffffeff
field public static final int TAG_NETWORK_STACK_RANGE_START = -768; // 0xfffffd00
field public static final int TAG_SYSTEM_IMPERSONATION_RANGE_END = -241; // 0xffffff0f
field public static final int TAG_SYSTEM_IMPERSONATION_RANGE_START = -256; // 0xffffff00
}
public abstract class Uri implements java.lang.Comparable<android.net.Uri> android.os.Parcelable {
method @NonNull public String toSafeString();
}
@@ -7381,23 +7319,6 @@ package android.net.metrics {
}
package android.net.netstats.provider {
public abstract class NetworkStatsProvider {
ctor public NetworkStatsProvider();
method public void notifyAlertReached();
method public void notifyLimitReached();
method public void notifyStatsUpdated(int, @NonNull android.net.NetworkStats, @NonNull android.net.NetworkStats);
method public void notifyWarningReached();
method public abstract void onRequestStatsUpdate(int);
method public abstract void onSetAlert(long);
method public abstract void onSetLimit(@NonNull String, long);
method public void onSetWarningAndLimit(@NonNull String, long, long);
field public static final int QUOTA_UNLIMITED = -1; // 0xffffffff
}
}
package android.net.sip {
@Deprecated public class SipAudioCall {

11
core/api/test-current.txt
View File

@@ -635,10 +635,6 @@ package android.app.prediction {
package android.app.usage {
public class NetworkStatsManager {
method public void setPollForce(boolean);
}
public class StorageStatsManager {
method public boolean isQuotaSupported(@NonNull java.util.UUID);
method public boolean isReservedSupported(@NonNull java.util.UUID);
@@ -1589,13 +1585,6 @@ package android.net {
method @Nullable public byte[] getWatchlistConfigHash();
}
public class TrafficStats {
method public static long getLoopbackRxBytes();
method public static long getLoopbackRxPackets();
method public static long getLoopbackTxBytes();
method public static long getLoopbackTxPackets();
}
}
package android.os {

13
core/java/android/app/SystemServiceRegistry.java
View File

@@ -44,7 +44,6 @@ import android.app.timezonedetector.TimeZoneDetectorImpl;
import android.app.trust.TrustManager;
import android.app.usage.IStorageStatsManager;
import android.app.usage.IUsageStatsManager;
import android.app.usage.NetworkStatsManager;
import android.app.usage.StorageStatsManager;
import android.app.usage.UsageStatsManager;
import android.apphibernation.AppHibernationManager;
@@ -129,7 +128,6 @@ import android.net.ConnectivityFrameworkInitializerTiramisu;
import android.net.EthernetManager;
import android.net.IEthernetManager;
import android.net.INetworkPolicyManager;
import android.net.INetworkStatsService;
import android.net.IPacProxyManager;
import android.net.IVpnManager;
import android.net.NetworkPolicyManager;
@@ -967,17 +965,6 @@ public final class SystemServiceRegistry {
return new UsageStatsManager(ctx.getOuterContext(), service);
}});
registerService(Context.NETWORK_STATS_SERVICE, NetworkStatsManager.class,
new CachedServiceFetcher<NetworkStatsManager>() {
@Override
public NetworkStatsManager createService(ContextImpl ctx) throws ServiceNotFoundException {
// TODO: Replace with an initializer in the module, see
// {@code ConnectivityFrameworkInitializer}.
final INetworkStatsService service = INetworkStatsService.Stub.asInterface(
ServiceManager.getServiceOrThrow(Context.NETWORK_STATS_SERVICE));
return new NetworkStatsManager(ctx.getOuterContext(), service);
}});
registerService(Context.PERSISTENT_DATA_BLOCK_SERVICE, PersistentDataBlockManager.class,
new StaticServiceFetcher<PersistentDataBlockManager>() {
@Override

2
core/jni/Android.bp
View File

@@ -297,8 +297,6 @@ cc_library_shared {
"libdl_android",
"libtimeinstate",
"server_configurable_flags",
// TODO: delete when ConnectivityT moves to APEX.
"libframework-connectivity-tiramisu-jni",
],
export_shared_lib_headers: [
// our headers include libnativewindow's public headers

9
packages/ConnectivityT/framework-t/Android.bp
View File

@@ -158,7 +158,6 @@ filegroup {
name: "framework-connectivity-tiramisu-sources",
srcs: [
":framework-connectivity-ethernet-sources",
":framework-connectivity-netstats-sources",
],
visibility: ["//frameworks/base"],
}
@@ -167,6 +166,7 @@ filegroup {
name: "framework-connectivity-tiramisu-updatable-sources",
srcs: [
":framework-connectivity-ipsec-sources",
":framework-connectivity-netstats-sources",
":framework-connectivity-nsd-sources",
":framework-connectivity-tiramisu-internal-sources",
],
@@ -194,15 +194,12 @@ cc_library_shared {
"jni/onload.cpp",
],
shared_libs: [
"libandroid",
"liblog",
],
static_libs: [
"libnativehelper_compat_libc++",
"libnativehelper",
],
stl: "none",
apex_available: [
"com.android.tethering",
// TODO: remove when ConnectivityT moves to APEX.
"//apex_available:platform",
],
}

9
packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java
View File

@@ -27,7 +27,6 @@ import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
import android.annotation.WorkerThread;
import android.app.usage.NetworkStats.Bucket;
import android.compat.annotation.UnsupportedAppUsage;
@@ -192,9 +191,13 @@ public class NetworkStatsManager {
}
}
/** @hide */
/**
* Set poll force flag to indicate that calling any subsequent query method will force a stats
* poll.
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@TestApi
@SystemApi(client = MODULE_LIBRARIES)
public void setPollForce(boolean pollForce) {
if (pollForce) {
mFlags |= FLAG_POLL_FORCE;

11
packages/ConnectivityT/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java
View File

@@ -18,6 +18,7 @@ package android.net;
import android.annotation.SystemApi;
import android.app.SystemServiceRegistry;
import android.app.usage.NetworkStatsManager;
import android.content.Context;
import android.net.nsd.INsdManager;
import android.net.nsd.NsdManager;
@@ -57,5 +58,15 @@ public final class ConnectivityFrameworkInitializerTiramisu {
return new IpSecManager(context, service);
}
);
SystemServiceRegistry.registerContextAwareService(
Context.NETWORK_STATS_SERVICE,
NetworkStatsManager.class,
(context, serviceBinder) -> {
INetworkStatsService service =
INetworkStatsService.Stub.asInterface(serviceBinder);
return new NetworkStatsManager(context, service);
}
);
}
}

10
packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
View File

@@ -184,14 +184,14 @@ public class NetworkIdentity {
public void dumpDebug(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag);
proto.write(NetworkIdentityProto.TYPE, mType);
proto.write(NetworkIdentityProto.TYPE_FIELD_NUMBER, mType);
// TODO: dump mRatType as well.
proto.write(NetworkIdentityProto.ROAMING, mRoaming);
proto.write(NetworkIdentityProto.METERED, mMetered);
proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork);
proto.write(NetworkIdentityProto.OEM_MANAGED_NETWORK, mOemManaged);
proto.write(NetworkIdentityProto.ROAMING_FIELD_NUMBER, mRoaming);
proto.write(NetworkIdentityProto.METERED_FIELD_NUMBER, mMetered);
proto.write(NetworkIdentityProto.DEFAULT_NETWORK_FIELD_NUMBER, mDefaultNetwork);
proto.write(NetworkIdentityProto.OEM_MANAGED_NETWORK_FIELD_NUMBER, mOemManaged);
proto.end(start);
}

2
packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java
View File

@@ -212,7 +212,7 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> {
final long start = proto.start(tag);
for (NetworkIdentity ident : this) {
ident.dumpDebug(proto, NetworkIdentitySetProto.IDENTITIES);
ident.dumpDebug(proto, NetworkIdentitySetProto.IDENTITIES_FIELD_NUMBER);
}
proto.end(start);

14
packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java
View File

@@ -732,19 +732,19 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
final long start = proto.start(tag);
for (Key key : getSortedKeys()) {
final long startStats = proto.start(NetworkStatsCollectionProto.STATS);
final long startStats = proto.start(NetworkStatsCollectionProto.STATS_FIELD_NUMBER);
// Key
final long startKey = proto.start(NetworkStatsCollectionStatsProto.KEY);
key.ident.dumpDebug(proto, NetworkStatsCollectionKeyProto.IDENTITY);
proto.write(NetworkStatsCollectionKeyProto.UID, key.uid);
proto.write(NetworkStatsCollectionKeyProto.SET, key.set);
proto.write(NetworkStatsCollectionKeyProto.TAG, key.tag);
final long startKey = proto.start(NetworkStatsCollectionStatsProto.KEY_FIELD_NUMBER);
key.ident.dumpDebug(proto, NetworkStatsCollectionKeyProto.IDENTITY_FIELD_NUMBER);
proto.write(NetworkStatsCollectionKeyProto.UID_FIELD_NUMBER, key.uid);
proto.write(NetworkStatsCollectionKeyProto.SET_FIELD_NUMBER, key.set);
proto.write(NetworkStatsCollectionKeyProto.TAG_FIELD_NUMBER, key.tag);
proto.end(startKey);
// Value
final NetworkStatsHistory history = mStats.get(key);
history.dumpDebug(proto, NetworkStatsCollectionStatsProto.HISTORY);
history.dumpDebug(proto, NetworkStatsCollectionStatsProto.HISTORY_FIELD_NUMBER);
proto.end(startStats);
}

17
packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java
View File

@@ -915,17 +915,18 @@ public final class NetworkStatsHistory implements Parcelable {
public void dumpDebug(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag);
proto.write(NetworkStatsHistoryProto.BUCKET_DURATION_MS, bucketDuration);
proto.write(NetworkStatsHistoryProto.BUCKET_DURATION_MS_FIELD_NUMBER, bucketDuration);
for (int i = 0; i < bucketCount; i++) {
final long startBucket = proto.start(NetworkStatsHistoryProto.BUCKETS);
final long startBucket = proto.start(NetworkStatsHistoryProto.BUCKETS_FIELD_NUMBER);
proto.write(NetworkStatsHistoryBucketProto.BUCKET_START_MS, bucketStart[i]);
dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_BYTES, rxBytes, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_PACKETS, rxPackets, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_BYTES, txBytes, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_PACKETS, txPackets, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.OPERATIONS, operations, i);
proto.write(NetworkStatsHistoryBucketProto.BUCKET_START_MS_FIELD_NUMBER,
bucketStart[i]);
dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_BYTES_FIELD_NUMBER, rxBytes, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_PACKETS_FIELD_NUMBER, rxPackets, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_BYTES_FIELD_NUMBER, txBytes, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_PACKETS_FIELD_NUMBER, txPackets, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.OPERATIONS_FIELD_NUMBER, operations, i);
proto.end(startBucket);
}

8
packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java
View File

@@ -79,7 +79,8 @@ public final class NetworkTemplate implements Parcelable {
MATCH_WIFI,
MATCH_ETHERNET,
MATCH_BLUETOOTH,
MATCH_CARRIER
MATCH_PROXY,
MATCH_CARRIER,
})
public @interface TemplateMatchRule{}
@@ -104,9 +105,8 @@ public final class NetworkTemplate implements Parcelable {
/** Match rule to match bluetooth networks. */
public static final int MATCH_BLUETOOTH = 8;
/**
* Match rule to match networks with {@link Connectivity#TYPE_PROXY} as the legacy network type.
*
* @hide
* Match rule to match networks with {@link ConnectivityManager#TYPE_PROXY} as the legacy
* network type.
*/
public static final int MATCH_PROXY = 9;
/**

26
packages/ConnectivityT/service/Android.bp
View File

@@ -40,6 +40,30 @@ filegroup {
],
}
// For test code only.
filegroup {
name: "lib_networkStatsFactory_native",
srcs: [
"jni/com_android_server_net_NetworkStatsFactory.cpp",
],
path: "jni",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
],
}
filegroup {
name: "services.connectivity-netstats-jni-sources",
srcs: [
"jni/com_android_server_net_NetworkStatsFactory.cpp",
"jni/com_android_server_net_NetworkStatsService.cpp",
],
path: "jni",
visibility: [
"//packages/modules/Connectivity:__subpackages__",
],
}
// Nsd related libraries.
filegroup {
@@ -88,7 +112,6 @@ filegroup {
name: "services.connectivity-tiramisu-sources",
srcs: [
":services.connectivity-ethernet-sources",
":services.connectivity-netstats-sources",
],
path: "src",
visibility: ["//frameworks/base/services/core"],
@@ -98,6 +121,7 @@ filegroup {
name: "services.connectivity-tiramisu-updatable-sources",
srcs: [
":services.connectivity-ipsec-sources",
":services.connectivity-netstats-sources",
":services.connectivity-nsd-sources",
],
path: "src",

0
services/core/jni/com_android_server_net_NetworkStatsFactory.cpp → packages/ConnectivityT/service/jni/com_android_server_net_NetworkStatsFactory.cpp
View File

0
services/core/jni/com_android_server_net_NetworkStatsService.cpp → packages/ConnectivityT/service/jni/com_android_server_net_NetworkStatsService.cpp
View File

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

@@ -54,6 +54,10 @@ import java.util.concurrent.ConcurrentHashMap;
* @hide
*/
public class NetworkStatsFactory {
static {
System.loadLibrary("service-connectivity");
}
private static final String TAG = "NetworkStatsFactory";
private static final boolean USE_NATIVE_PARSING = true;

6
packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java
View File

@@ -471,9 +471,11 @@ public class NetworkStatsRecorder {
public void dumpDebugLocked(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag);
if (mPending != null) {
proto.write(NetworkStatsRecorderProto.PENDING_TOTAL_BYTES, mPending.getTotalBytes());
proto.write(NetworkStatsRecorderProto.PENDING_TOTAL_BYTES_FIELD_NUMBER,
mPending.getTotalBytes());
}
getOrLoadCompleteLocked().dumpDebug(proto, NetworkStatsRecorderProto.COMPLETE_HISTORY);
getOrLoadCompleteLocked().dumpDebug(proto,
NetworkStatsRecorderProto.COMPLETE_HISTORY_FIELD_NUMBER);
proto.end(start);
}

26
packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java
View File

@@ -63,6 +63,7 @@ import static com.android.net.module.util.NetworkStatsUtils.LIMIT_GLOBAL_ALERT;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TargetApi;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.app.usage.NetworkStatsManager;
@@ -103,6 +104,7 @@ import android.net.netstats.provider.INetworkStatsProvider;
import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.net.netstats.provider.NetworkStatsProvider;
import android.os.Binder;
import android.os.Build;
import android.os.DropBoxManager;
import android.os.Environment;
import android.os.Handler;
@@ -169,7 +171,12 @@ import java.util.concurrent.TimeUnit;
* Collect and persist detailed network statistics, and provide this data to
* other system services.
*/
@TargetApi(Build.VERSION_CODES.TIRAMISU)
public class NetworkStatsService extends INetworkStatsService.Stub {
static {
System.loadLibrary("service-connectivity");
}
static final String TAG = "NetworkStats";
static final boolean LOGD = Log.isLoggable(TAG, Log.DEBUG);
static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);
@@ -2120,12 +2127,15 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
// TODO Right now it writes all history. Should it limit to the "since-boot" log?
dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_INTERFACES, mActiveIfaces);
dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_UID_INTERFACES, mActiveUidIfaces);
mDevRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.DEV_STATS);
mXtRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.XT_STATS);
mUidRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.UID_STATS);
mUidTagRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.UID_TAG_STATS);
dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_INTERFACES_FIELD_NUMBER,
mActiveIfaces);
dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_UID_INTERFACES_FIELD_NUMBER,
mActiveUidIfaces);
mDevRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.DEV_STATS_FIELD_NUMBER);
mXtRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.XT_STATS_FIELD_NUMBER);
mUidRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.UID_STATS_FIELD_NUMBER);
mUidTagRecorder.dumpDebugLocked(proto,
NetworkStatsServiceDumpProto.UID_TAG_STATS_FIELD_NUMBER);
proto.flush();
}
@@ -2135,8 +2145,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
for (int i = 0; i < ifaces.size(); i++) {
final long start = proto.start(tag);
proto.write(NetworkInterfaceProto.INTERFACE, ifaces.keyAt(i));
ifaces.valueAt(i).dumpDebug(proto, NetworkInterfaceProto.IDENTITIES);
proto.write(NetworkInterfaceProto.INTERFACE_FIELD_NUMBER, ifaces.keyAt(i));
ifaces.valueAt(i).dumpDebug(proto, NetworkInterfaceProto.IDENTITIES_FIELD_NUMBER);
proto.end(start);
}

3
packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
View File

@@ -23,7 +23,9 @@ import static android.telephony.TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NS
import static android.telephony.TelephonyManager.NETWORK_TYPE_LTE;
import android.annotation.NonNull;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyDisplayInfo;
@@ -43,6 +45,7 @@ import java.util.concurrent.Executor;
/**
* Helper class that watches for events that are triggered per subscription.
*/
@TargetApi(Build.VERSION_CODES.TIRAMISU)
public class NetworkStatsSubscriptionsMonitor extends
SubscriptionManager.OnSubscriptionsChangedListener {

4
services/Android.bp
View File

@@ -178,10 +178,6 @@ cc_library_shared {
name: "libandroid_servers",
defaults: ["libservices.core-libs"],
whole_static_libs: ["libservices.core"],
required: [
// TODO: remove after NetworkStatsService is moved to the mainline module.
"libcom_android_net_module_util_jni",
],
}
platform_compat_config {

13
services/core/jni/Android.bp
View File

@@ -47,7 +47,6 @@ cc_library_static {
"com_android_server_lights_LightsService.cpp",
"com_android_server_location_GnssLocationProvider.cpp",
"com_android_server_locksettings_SyntheticPasswordManager.cpp",
"com_android_server_net_NetworkStatsService.cpp",
"com_android_server_power_PowerManagerService.cpp",
"com_android_server_powerstats_PowerStatsService.cpp",
"com_android_server_hint_HintManagerService.cpp",
@@ -73,7 +72,6 @@ cc_library_static {
"com_android_server_sensor_SensorService.cpp",
"onload.cpp",
":lib_cachedAppOptimizer_native",
":lib_networkStatsFactory_native",
],
include_dirs: [
@@ -85,7 +83,6 @@ cc_library_static {
header_libs: [
"bionic_libc_platform_headers",
"bpf_connectivity_headers",
],
}
@@ -140,9 +137,6 @@ cc_defaults {
"libhidlbase",
"libutils",
"libhwui",
"libbpf_android",
"libnetdutils",
"libnetworkstats",
"libpsi",
"libdataloader",
"libincfs",
@@ -204,13 +198,6 @@ cc_defaults {
},
}
filegroup {
name: "lib_networkStatsFactory_native",
srcs: [
"com_android_server_net_NetworkStatsFactory.cpp",
],
}
filegroup {
name: "lib_cachedAppOptimizer_native",
srcs: [

4
services/core/jni/onload.cpp
View File

@@ -51,8 +51,6 @@ int register_android_server_Watchdog(JNIEnv* env);
int register_android_server_HardwarePropertiesManagerService(JNIEnv* env);
int register_android_server_SyntheticPasswordManager(JNIEnv* env);
int register_android_hardware_display_DisplayViewport(JNIEnv* env);
int register_android_server_net_NetworkStatsFactory(JNIEnv* env);
int register_android_server_net_NetworkStatsService(JNIEnv* env);
int register_android_server_am_CachedAppOptimizer(JNIEnv* env);
int register_android_server_am_LowMemDetector(JNIEnv* env);
int register_com_android_server_soundtrigger_middleware_AudioSessionProviderImpl(JNIEnv* env);
@@ -107,8 +105,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
register_android_server_SyntheticPasswordManager(env);
register_android_graphics_GraphicsStatsService(env);
register_android_hardware_display_DisplayViewport(env);
register_android_server_net_NetworkStatsFactory(env);
register_android_server_net_NetworkStatsService(env);
register_android_server_am_CachedAppOptimizer(env);
register_android_server_am_LowMemDetector(env);
register_com_android_server_soundtrigger_middleware_AudioSessionProviderImpl(env);

26
services/java/com/android/server/SystemServer.java
View File

@@ -54,7 +54,6 @@ import android.hardware.display.DisplayManagerInternal;
import android.net.ConnectivityManager;
import android.net.ConnectivityModuleConnector;
import android.net.NetworkStackClient;
import android.net.TrafficStats;
import android.os.BaseBundle;
import android.os.Binder;
import android.os.Build;
@@ -141,7 +140,6 @@ import com.android.server.media.MediaRouterService;
import com.android.server.media.metrics.MediaMetricsManagerService;
import com.android.server.media.projection.MediaProjectionManagerService;
import com.android.server.net.NetworkPolicyManagerService;
import com.android.server.net.NetworkStatsService;
import com.android.server.net.watchlist.NetworkWatchlistService;
import com.android.server.notification.NotificationManagerService;
import com.android.server.oemlock.OemLockService;
@@ -379,6 +377,8 @@ public final class SystemServer implements Dumpable {
"com.android.server.media.MediaResourceMonitorService";
private static final String CONNECTIVITY_SERVICE_INITIALIZER_CLASS =
"com.android.server.ConnectivityServiceInitializer";
private static final String NETWORK_STATS_SERVICE_INITIALIZER_CLASS =
"com.android.server.NetworkStatsServiceInitializer";
private static final String IP_CONNECTIVITY_METRICS_CLASS =
"com.android.server.connectivity.IpConnectivityMetrics";
private static final String MEDIA_COMMUNICATION_SERVICE_CLASS =
@@ -1336,7 +1336,6 @@ public final class SystemServer implements Dumpable {
NetworkManagementService networkManagement = null;
VpnManagerService vpnManager = null;
VcnManagementService vcnManagement = null;
NetworkStatsService networkStats = null;
NetworkPolicyManagerService networkPolicy = null;
WindowManagerService wm = null;
SerialService serial = null;
@@ -1825,13 +1824,10 @@ public final class SystemServer implements Dumpable {
t.traceEnd();
t.traceBegin("StartNetworkStatsService");
try {
networkStats = NetworkStatsService.create(context);
ServiceManager.addService(Context.NETWORK_STATS_SERVICE, networkStats);
TrafficStats.init(context);
} catch (Throwable e) {
reportWtf("starting NetworkStats Service", e);
}
// This has to be called before NetworkPolicyManager because NetworkPolicyManager
// needs to take NetworkStatsService to initialize.
mSystemServiceManager.startServiceFromJar(NETWORK_STATS_SERVICE_INITIALIZER_CLASS,
CONNECTIVITY_SERVICE_APEX_PATH);
t.traceEnd();
t.traceBegin("StartNetworkPolicyManagerService");
@@ -2648,7 +2644,6 @@ public final class SystemServer implements Dumpable {
// These are needed to propagate to the runnable below.
final NetworkManagementService networkManagementF = networkManagement;
final NetworkStatsService networkStatsF = networkStats;
final NetworkPolicyManagerService networkPolicyF = networkPolicy;
final CountryDetectorService countryDetectorF = countryDetector;
final NetworkTimeUpdateService networkTimeUpdaterF = networkTimeUpdater;
@@ -2745,15 +2740,6 @@ public final class SystemServer implements Dumpable {
.networkScoreAndNetworkManagementServiceReady();
}
t.traceEnd();
t.traceBegin("MakeNetworkStatsServiceReady");
try {
if (networkStatsF != null) {
networkStatsF.systemReady();
}
} catch (Throwable e) {
reportWtf("making Network Stats Service ready", e);
}
t.traceEnd();
t.traceBegin("MakeConnectivityServiceReady");
try {
if (connectivityF != null) {