diff --git a/framework-t/api/current.txt b/framework-t/api/current.txt index 4fefa0a17c..84cdbf7e55 100644 --- a/framework-t/api/current.txt +++ b/framework-t/api/current.txt @@ -3,7 +3,7 @@ package android.app.usage { public final class NetworkStats implements java.lang.AutoCloseable { method public void close(); - method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket); + method public boolean getNextBucket(@Nullable android.app.usage.NetworkStats.Bucket); method public boolean hasNextBucket(); } @@ -40,21 +40,21 @@ package android.app.usage { } 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); + method @WorkerThread public android.app.usage.NetworkStats queryDetails(int, @Nullable String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForUid(int, @Nullable String, long, long, int) throws java.lang.SecurityException; + method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTag(int, @Nullable String, long, long, int, int) throws java.lang.SecurityException; + method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTagState(int, @Nullable String, long, long, int, int, int) throws java.lang.SecurityException; + method @WorkerThread public android.app.usage.NetworkStats querySummary(int, @Nullable String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, @Nullable String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, @Nullable String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method public void registerUsageCallback(int, @Nullable String, long, @NonNull android.app.usage.NetworkStatsManager.UsageCallback); + method public void registerUsageCallback(int, @Nullable String, long, @NonNull android.app.usage.NetworkStatsManager.UsageCallback, @Nullable android.os.Handler); + method public void unregisterUsageCallback(@NonNull android.app.usage.NetworkStatsManager.UsageCallback); } public abstract static class NetworkStatsManager.UsageCallback { ctor public NetworkStatsManager.UsageCallback(); - method public abstract void onThresholdReached(int, String); + method public abstract void onThresholdReached(int, @Nullable String); } } @@ -173,12 +173,12 @@ package android.net { 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; + method public static void tagDatagramSocket(@NonNull java.net.DatagramSocket) throws java.net.SocketException; + method public static void tagFileDescriptor(@NonNull java.io.FileDescriptor) throws java.io.IOException; + method public static void tagSocket(@NonNull java.net.Socket) throws java.net.SocketException; + method public static void untagDatagramSocket(@NonNull java.net.DatagramSocket) throws java.net.SocketException; + method public static void untagFileDescriptor(@NonNull java.io.FileDescriptor) throws java.io.IOException; + method public static void untagSocket(@NonNull java.net.Socket) throws java.net.SocketException; field public static final int UNSUPPORTED = -1; // 0xffffffff } diff --git a/framework-t/api/lint-baseline.txt b/framework-t/api/lint-baseline.txt index 53e1beb653..2996a3ea5f 100644 --- a/framework-t/api/lint-baseline.txt +++ b/framework-t/api/lint-baseline.txt @@ -41,86 +41,18 @@ MissingBuildMethod: android.net.IpSecTransform.Builder: android.net.IpSecTransform.Builder does not declare a `build()` method, but builder classes are expected to -MissingNullability: android.app.usage.NetworkStats#getNextBucket(android.app.usage.NetworkStats.Bucket) parameter #0: - Missing nullability on parameter `bucketOut` in method `getNextBucket` MissingNullability: android.app.usage.NetworkStatsManager#queryDetails(int, String, long, long): Missing nullability on method `queryDetails` return -MissingNullability: android.app.usage.NetworkStatsManager#queryDetails(int, String, long, long) parameter #1: - Missing nullability on parameter `subscriberId` in method `queryDetails` -MissingNullability: android.app.usage.NetworkStatsManager#queryDetailsForUid(int, String, long, long, int): - Missing nullability on method `queryDetailsForUid` return -MissingNullability: android.app.usage.NetworkStatsManager#queryDetailsForUid(int, String, long, long, int) parameter #1: - Missing nullability on parameter `subscriberId` in method `queryDetailsForUid` -MissingNullability: android.app.usage.NetworkStatsManager#queryDetailsForUidTag(int, String, long, long, int, int): - Missing nullability on method `queryDetailsForUidTag` return -MissingNullability: android.app.usage.NetworkStatsManager#queryDetailsForUidTag(int, String, long, long, int, int) parameter #1: - Missing nullability on parameter `subscriberId` in method `queryDetailsForUidTag` -MissingNullability: android.app.usage.NetworkStatsManager#queryDetailsForUidTagState(int, String, long, long, int, int, int): - Missing nullability on method `queryDetailsForUidTagState` return -MissingNullability: android.app.usage.NetworkStatsManager#queryDetailsForUidTagState(int, String, long, long, int, int, int) parameter #1: - Missing nullability on parameter `subscriberId` in method `queryDetailsForUidTagState` MissingNullability: android.app.usage.NetworkStatsManager#querySummary(int, String, long, long): Missing nullability on method `querySummary` return -MissingNullability: android.app.usage.NetworkStatsManager#querySummary(int, String, long, long) parameter #1: - Missing nullability on parameter `subscriberId` in method `querySummary` MissingNullability: android.app.usage.NetworkStatsManager#querySummaryForDevice(int, String, long, long): Missing nullability on method `querySummaryForDevice` return -MissingNullability: android.app.usage.NetworkStatsManager#querySummaryForDevice(int, String, long, long) parameter #1: - Missing nullability on parameter `subscriberId` in method `querySummaryForDevice` MissingNullability: android.app.usage.NetworkStatsManager#querySummaryForUser(int, String, long, long): Missing nullability on method `querySummaryForUser` return -MissingNullability: android.app.usage.NetworkStatsManager#querySummaryForUser(int, String, long, long) parameter #1: - Missing nullability on parameter `subscriberId` in method `querySummaryForUser` -MissingNullability: android.app.usage.NetworkStatsManager#registerUsageCallback(int, String, long, android.app.usage.NetworkStatsManager.UsageCallback) parameter #1: - Missing nullability on parameter `subscriberId` in method `registerUsageCallback` -MissingNullability: android.app.usage.NetworkStatsManager#registerUsageCallback(int, String, long, android.app.usage.NetworkStatsManager.UsageCallback) parameter #3: - Missing nullability on parameter `callback` in method `registerUsageCallback` -MissingNullability: android.app.usage.NetworkStatsManager#registerUsageCallback(int, String, long, android.app.usage.NetworkStatsManager.UsageCallback, android.os.Handler) parameter #1: - Missing nullability on parameter `subscriberId` in method `registerUsageCallback` -MissingNullability: android.app.usage.NetworkStatsManager#registerUsageCallback(int, String, long, android.app.usage.NetworkStatsManager.UsageCallback, android.os.Handler) parameter #3: - Missing nullability on parameter `callback` in method `registerUsageCallback` -MissingNullability: android.app.usage.NetworkStatsManager#unregisterUsageCallback(android.app.usage.NetworkStatsManager.UsageCallback) parameter #0: - Missing nullability on parameter `callback` in method `unregisterUsageCallback` -MissingNullability: android.app.usage.NetworkStatsManager.UsageCallback#onThresholdReached(int, String) parameter #1: - Missing nullability on parameter `subscriberId` in method `onThresholdReached` MissingNullability: android.net.IpSecAlgorithm#writeToParcel(android.os.Parcel, int) parameter #0: Missing nullability on parameter `out` in method `writeToParcel` MissingNullability: android.net.IpSecManager.UdpEncapsulationSocket#getFileDescriptor(): Missing nullability on method `getFileDescriptor` return -MissingNullability: android.net.TrafficStats#tagDatagramSocket(java.net.DatagramSocket) parameter #0: - Missing nullability on parameter `socket` in method `tagDatagramSocket` -MissingNullability: android.net.TrafficStats#tagFileDescriptor(java.io.FileDescriptor) parameter #0: - Missing nullability on parameter `fd` in method `tagFileDescriptor` -MissingNullability: android.net.TrafficStats#tagSocket(java.net.Socket) parameter #0: - Missing nullability on parameter `socket` in method `tagSocket` -MissingNullability: android.net.TrafficStats#untagDatagramSocket(java.net.DatagramSocket) parameter #0: - Missing nullability on parameter `socket` in method `untagDatagramSocket` -MissingNullability: android.net.TrafficStats#untagFileDescriptor(java.io.FileDescriptor) parameter #0: - Missing nullability on parameter `fd` in method `untagFileDescriptor` -MissingNullability: android.net.TrafficStats#untagSocket(java.net.Socket) parameter #0: - Missing nullability on parameter `socket` in method `untagSocket` -MissingNullability: com.android.internal.util.FileRotator#FileRotator(java.io.File, String, long, long) parameter #0: - Missing nullability on parameter `basePath` in method `FileRotator` -MissingNullability: com.android.internal.util.FileRotator#FileRotator(java.io.File, String, long, long) parameter #1: - Missing nullability on parameter `prefix` in method `FileRotator` -MissingNullability: com.android.internal.util.FileRotator#dumpAll(java.io.OutputStream) parameter #0: - Missing nullability on parameter `os` in method `dumpAll` -MissingNullability: com.android.internal.util.FileRotator#readMatching(com.android.internal.util.FileRotator.Reader, long, long) parameter #0: - Missing nullability on parameter `reader` in method `readMatching` -MissingNullability: com.android.internal.util.FileRotator#rewriteActive(com.android.internal.util.FileRotator.Rewriter, long) parameter #0: - Missing nullability on parameter `rewriter` in method `rewriteActive` -MissingNullability: com.android.internal.util.FileRotator#rewriteAll(com.android.internal.util.FileRotator.Rewriter) parameter #0: - Missing nullability on parameter `rewriter` in method `rewriteAll` -MissingNullability: com.android.internal.util.FileRotator.Reader#read(java.io.InputStream) parameter #0: - Missing nullability on parameter `in` in method `read` -MissingNullability: com.android.internal.util.FileRotator.Writer#write(java.io.OutputStream) parameter #0: - Missing nullability on parameter `out` in method `write` -MissingNullability: com.android.server.NetworkManagementSocketTagger#kernelToTag(String) parameter #0: - Missing nullability on parameter `string` in method `kernelToTag` -MissingNullability: com.android.server.NetworkManagementSocketTagger#tag(java.io.FileDescriptor) parameter #0: - Missing nullability on parameter `fd` in method `tag` -MissingNullability: com.android.server.NetworkManagementSocketTagger#untag(java.io.FileDescriptor) parameter #0: - Missing nullability on parameter `fd` in method `untag` RethrowRemoteException: android.app.usage.NetworkStatsManager#queryDetails(int, String, long, long): diff --git a/framework-t/api/module-lib-current.txt b/framework-t/api/module-lib-current.txt index 0176b6fb2a..3969d87711 100644 --- a/framework-t/api/module-lib-current.txt +++ b/framework-t/api/module-lib-current.txt @@ -4,6 +4,8 @@ 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 @NonNull @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public android.net.NetworkStats getMobileUidStats(); + method @NonNull @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public android.net.NetworkStats getWifiUidStats(); method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void noteUidForeground(int, boolean); method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void notifyNetworkStatus(@NonNull java.util.List, @NonNull java.util.List, @Nullable String, @NonNull java.util.List); method @NonNull @WorkerThread public android.app.usage.NetworkStats queryDetailsForDevice(@NonNull android.net.NetworkTemplate, long, long); @@ -104,6 +106,24 @@ package android.net { field @NonNull public static final android.os.Parcelable.Creator CREATOR; } + public final class NetworkStats implements java.lang.Iterable android.os.Parcelable { + method @NonNull public java.util.Iterator iterator(); + } + + public static class NetworkStats.Entry { + 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 NetworkStatsCollection { method @NonNull public java.util.Map getEntries(); } @@ -184,6 +204,7 @@ package android.net { public class TrafficStats { method public static void attachSocketTagger(); method public static void init(@NonNull android.content.Context); + method public static void setThreadStatsTagDownload(); } public final class UnderlyingNetworkInfo implements android.os.Parcelable { diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt index 46eb9ee73c..31aa499d48 100644 --- a/framework-t/api/system-current.txt +++ b/framework-t/api/system-current.txt @@ -2,10 +2,8 @@ package android.app.usage { public class NetworkStatsManager { - method @NonNull @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public android.net.NetworkStats getMobileUidStats(); - method @NonNull @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.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); + method @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 @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STATS_PROVIDER, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void unregisterNetworkStatsProvider(@NonNull android.net.netstats.provider.NetworkStatsProvider); } } @@ -553,7 +551,6 @@ package android.net { 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 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 CREATOR; @@ -577,23 +574,11 @@ package android.net { 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 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