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

Commit a45c0d91 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge changes from topic "ms52-movenetstats" 

* 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
parents f6454716 9f4d51d0

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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

StubLibraries.bp

+1 −0
Original line number Diff line number Diff line
@@ -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",

boot/hiddenapi/hiddenapi-max-target-o.txt

+0 −176
Original line number Diff line number Diff line
@@ -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;

boot/hiddenapi/hiddenapi-unsupported.txt

+0 −3
Original line number Diff line number Diff line
@@ -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;

core/api/current.txt

+0 −100
Original line number Diff line number Diff line
@@ -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);