diff --git a/Tethering/common/TetheringLib/api/current.txt b/Tethering/common/TetheringLib/api/current.txt index 14191ebcb0..d802177e24 100644 --- a/Tethering/common/TetheringLib/api/current.txt +++ b/Tethering/common/TetheringLib/api/current.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 diff --git a/Tethering/common/TetheringLib/api/module-lib-current.txt b/Tethering/common/TetheringLib/api/module-lib-current.txt index f09b26d702..460c21621d 100644 --- a/Tethering/common/TetheringLib/api/module-lib-current.txt +++ b/Tethering/common/TetheringLib/api/module-lib-current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.net { public final class TetheringConstants { diff --git a/Tethering/common/TetheringLib/api/module-lib-removed.txt b/Tethering/common/TetheringLib/api/module-lib-removed.txt index 14191ebcb0..d802177e24 100644 --- a/Tethering/common/TetheringLib/api/module-lib-removed.txt +++ b/Tethering/common/TetheringLib/api/module-lib-removed.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 diff --git a/Tethering/common/TetheringLib/api/removed.txt b/Tethering/common/TetheringLib/api/removed.txt index 14191ebcb0..d802177e24 100644 --- a/Tethering/common/TetheringLib/api/removed.txt +++ b/Tethering/common/TetheringLib/api/removed.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 diff --git a/Tethering/common/TetheringLib/api/system-current.txt b/Tethering/common/TetheringLib/api/system-current.txt index 83cee2561c..844ff6471a 100644 --- a/Tethering/common/TetheringLib/api/system-current.txt +++ b/Tethering/common/TetheringLib/api/system-current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.net { public final class TetheredClient implements android.os.Parcelable { diff --git a/Tethering/common/TetheringLib/api/system-removed.txt b/Tethering/common/TetheringLib/api/system-removed.txt index 14191ebcb0..d802177e24 100644 --- a/Tethering/common/TetheringLib/api/system-removed.txt +++ b/Tethering/common/TetheringLib/api/system-removed.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 diff --git a/framework-t/api/current.txt b/framework-t/api/current.txt index e4b211fc0f..86745d401b 100644 --- a/framework-t/api/current.txt +++ b/framework-t/api/current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.app.usage { public final class NetworkStats implements java.lang.AutoCloseable { diff --git a/framework-t/api/module-lib-current.txt b/framework-t/api/module-lib-current.txt index fd42a372cb..5a8d47b5f5 100644 --- a/framework-t/api/module-lib-current.txt +++ b/framework-t/api/module-lib-current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.app.usage { public class NetworkStatsManager { diff --git a/framework-t/api/module-lib-removed.txt b/framework-t/api/module-lib-removed.txt index 14191ebcb0..d802177e24 100644 --- a/framework-t/api/module-lib-removed.txt +++ b/framework-t/api/module-lib-removed.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 diff --git a/framework-t/api/removed.txt b/framework-t/api/removed.txt index d9d243d7e8..1ba87d8a26 100644 --- a/framework-t/api/removed.txt +++ b/framework-t/api/removed.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.net { public class TrafficStats { diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt index 9bdb59556d..f6b5657dd9 100644 --- a/framework-t/api/system-current.txt +++ b/framework-t/api/system-current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.app.usage { public class NetworkStatsManager { @@ -307,6 +305,7 @@ package android.net { 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 android.net.NetworkStats clone(); method public int describeContents(); method @NonNull public java.util.Iterator iterator(); method @NonNull public android.net.NetworkStats subtract(@NonNull android.net.NetworkStats); diff --git a/framework-t/api/system-removed.txt b/framework-t/api/system-removed.txt index 14191ebcb0..d802177e24 100644 --- a/framework-t/api/system-removed.txt +++ b/framework-t/api/system-removed.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 diff --git a/framework/api/current.txt b/framework/api/current.txt index 4f00977fa2..6860c3c389 100644 --- a/framework/api/current.txt +++ b/framework/api/current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.net { public class CaptivePortal implements android.os.Parcelable { diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt index ac57c10841..193bd920d2 100644 --- a/framework/api/module-lib-current.txt +++ b/framework/api/module-lib-current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.net { public final class ConnectivityFrameworkInitializer { diff --git a/framework/api/module-lib-removed.txt b/framework/api/module-lib-removed.txt index 14191ebcb0..d802177e24 100644 --- a/framework/api/module-lib-removed.txt +++ b/framework/api/module-lib-removed.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 diff --git a/framework/api/removed.txt b/framework/api/removed.txt index f5da46a0b6..303a1e6173 100644 --- a/framework/api/removed.txt +++ b/framework/api/removed.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.net { public class ConnectivityManager { diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt index cd120e9f0b..e812024a70 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -1,6 +1,4 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704 package android.net { public class CaptivePortal implements android.os.Parcelable { @@ -96,6 +94,7 @@ package android.net { } public final class DscpPolicy implements android.os.Parcelable { + method public int describeContents(); method @Nullable public java.net.InetAddress getDestinationAddress(); method @Nullable public android.util.Range getDestinationPortRange(); method public int getDscpValue(); @@ -103,6 +102,7 @@ package android.net { method public int getProtocol(); method @Nullable public java.net.InetAddress getSourceAddress(); method public int getSourcePort(); + method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; field public static final int PROTOCOL_ANY = -1; // 0xffffffff field public static final int SOURCE_PORT_ANY = -1; // 0xffffffff diff --git a/framework/api/system-removed.txt b/framework/api/system-removed.txt index 14191ebcb0..d802177e24 100644 --- a/framework/api/system-removed.txt +++ b/framework/api/system-removed.txt @@ -1,3 +1 @@ // Signature format: 2.0 -// - add-additional-overrides=no -// - migrating=Migration in progress see b/299366704