Merge "Add additional overriding methods to signature files" into main

This commit is contained in:
Treehugger Robot
2023-10-13 15:05:40 +00:00
committed by Gerrit Code Review
18 changed files with 3 additions and 36 deletions

View File

@@ -1,3 +1 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.net { package android.net {
public final class TetheringConstants { public final class TetheringConstants {

View File

@@ -1,3 +1 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704

View File

@@ -1,3 +1 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.net { package android.net {
public final class TetheredClient implements android.os.Parcelable { public final class TetheredClient implements android.os.Parcelable {

View File

@@ -1,3 +1 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.app.usage { package android.app.usage {
public final class NetworkStats implements java.lang.AutoCloseable { public final class NetworkStats implements java.lang.AutoCloseable {

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.app.usage { package android.app.usage {
public class NetworkStatsManager { public class NetworkStatsManager {

View File

@@ -1,3 +1 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.net { package android.net {
public class TrafficStats { public class TrafficStats {

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.app.usage { package android.app.usage {
public class NetworkStatsManager { public class NetworkStatsManager {
@@ -307,6 +305,7 @@ package android.net {
ctor public NetworkStats(long, int); ctor public NetworkStats(long, int);
method @NonNull public android.net.NetworkStats add(@NonNull android.net.NetworkStats); method @NonNull public android.net.NetworkStats add(@NonNull android.net.NetworkStats);
method @NonNull public android.net.NetworkStats addEntry(@NonNull android.net.NetworkStats.Entry); method @NonNull public android.net.NetworkStats addEntry(@NonNull android.net.NetworkStats.Entry);
method public android.net.NetworkStats clone();
method public int describeContents(); method public int describeContents();
method @NonNull public java.util.Iterator<android.net.NetworkStats.Entry> iterator(); method @NonNull public java.util.Iterator<android.net.NetworkStats.Entry> iterator();
method @NonNull public android.net.NetworkStats subtract(@NonNull android.net.NetworkStats); method @NonNull public android.net.NetworkStats subtract(@NonNull android.net.NetworkStats);

View File

@@ -1,3 +1 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.net { package android.net {
public class CaptivePortal implements android.os.Parcelable { public class CaptivePortal implements android.os.Parcelable {

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.net { package android.net {
public final class ConnectivityFrameworkInitializer { public final class ConnectivityFrameworkInitializer {

View File

@@ -1,3 +1 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.net { package android.net {
public class ConnectivityManager { public class ConnectivityManager {

View File

@@ -1,6 +1,4 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704
package android.net { package android.net {
public class CaptivePortal implements android.os.Parcelable { public class CaptivePortal implements android.os.Parcelable {
@@ -96,6 +94,7 @@ package android.net {
} }
public final class DscpPolicy implements android.os.Parcelable { public final class DscpPolicy implements android.os.Parcelable {
method public int describeContents();
method @Nullable public java.net.InetAddress getDestinationAddress(); method @Nullable public java.net.InetAddress getDestinationAddress();
method @Nullable public android.util.Range<java.lang.Integer> getDestinationPortRange(); method @Nullable public android.util.Range<java.lang.Integer> getDestinationPortRange();
method public int getDscpValue(); method public int getDscpValue();
@@ -103,6 +102,7 @@ package android.net {
method public int getProtocol(); method public int getProtocol();
method @Nullable public java.net.InetAddress getSourceAddress(); method @Nullable public java.net.InetAddress getSourceAddress();
method public int getSourcePort(); method public int getSourcePort();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.DscpPolicy> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.net.DscpPolicy> CREATOR;
field public static final int PROTOCOL_ANY = -1; // 0xffffffff field public static final int PROTOCOL_ANY = -1; // 0xffffffff
field public static final int SOURCE_PORT_ANY = -1; // 0xffffffff field public static final int SOURCE_PORT_ANY = -1; // 0xffffffff

View File

@@ -1,3 +1 @@
// Signature format: 2.0 // Signature format: 2.0
// - add-additional-overrides=no
// - migrating=Migration in progress see b/299366704