From 7bd2d108eaa04518f0343b479faf6cdc21174ade Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 10 Oct 2023 17:11:25 +0100 Subject: [PATCH] Prepare for keeping concrete overrides of abstract methods Currently, metalava will discard concrete overrides of abstract methods from the API signature files which causes problems when attempting to generate stubs from those files and also discards information that may be important in API reviews. This change is the first step in the process of changing that behavior. This change hard codes the current behavior for discarding the concrete overrides (`add-additional-overrides=no`) into those signature files that will (or are likely) to be affected by the change in behavior. That allows the default behavior to be changed for all the other files without affecting these. Follow up changes will remove the hard coding from the signature files and will update the contents which will include the concrete overrides of the abstract methods. More information and the background for this change is available at go/add-overriding-one-pager. Test: m checkapi Bug: 299366704 Change-Id: I52c5bbe2e3bbd36019fe44fcb0b2d19876a5a869 --- Tethering/common/TetheringLib/api/current.txt | 2 ++ Tethering/common/TetheringLib/api/module-lib-current.txt | 2 ++ Tethering/common/TetheringLib/api/module-lib-removed.txt | 2 ++ Tethering/common/TetheringLib/api/removed.txt | 2 ++ Tethering/common/TetheringLib/api/system-current.txt | 2 ++ Tethering/common/TetheringLib/api/system-removed.txt | 2 ++ framework-t/api/current.txt | 2 ++ framework-t/api/module-lib-current.txt | 2 ++ framework-t/api/module-lib-removed.txt | 2 ++ framework-t/api/removed.txt | 2 ++ framework-t/api/system-current.txt | 2 ++ framework-t/api/system-removed.txt | 2 ++ framework/api/current.txt | 2 ++ framework/api/module-lib-current.txt | 2 ++ framework/api/module-lib-removed.txt | 2 ++ framework/api/removed.txt | 2 ++ framework/api/system-current.txt | 2 ++ framework/api/system-removed.txt | 2 ++ 18 files changed, 36 insertions(+) diff --git a/Tethering/common/TetheringLib/api/current.txt b/Tethering/common/TetheringLib/api/current.txt index d802177e24..14191ebcb0 100644 --- a/Tethering/common/TetheringLib/api/current.txt +++ b/Tethering/common/TetheringLib/api/current.txt @@ -1 +1,3 @@ // 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 460c21621d..f09b26d702 100644 --- a/Tethering/common/TetheringLib/api/module-lib-current.txt +++ b/Tethering/common/TetheringLib/api/module-lib-current.txt @@ -1,4 +1,6 @@ // 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 d802177e24..14191ebcb0 100644 --- a/Tethering/common/TetheringLib/api/module-lib-removed.txt +++ b/Tethering/common/TetheringLib/api/module-lib-removed.txt @@ -1 +1,3 @@ // 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 d802177e24..14191ebcb0 100644 --- a/Tethering/common/TetheringLib/api/removed.txt +++ b/Tethering/common/TetheringLib/api/removed.txt @@ -1 +1,3 @@ // 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 844ff6471a..83cee2561c 100644 --- a/Tethering/common/TetheringLib/api/system-current.txt +++ b/Tethering/common/TetheringLib/api/system-current.txt @@ -1,4 +1,6 @@ // 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 d802177e24..14191ebcb0 100644 --- a/Tethering/common/TetheringLib/api/system-removed.txt +++ b/Tethering/common/TetheringLib/api/system-removed.txt @@ -1 +1,3 @@ // 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 86745d401b..e4b211fc0f 100644 --- a/framework-t/api/current.txt +++ b/framework-t/api/current.txt @@ -1,4 +1,6 @@ // 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 5a8d47b5f5..fd42a372cb 100644 --- a/framework-t/api/module-lib-current.txt +++ b/framework-t/api/module-lib-current.txt @@ -1,4 +1,6 @@ // 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 d802177e24..14191ebcb0 100644 --- a/framework-t/api/module-lib-removed.txt +++ b/framework-t/api/module-lib-removed.txt @@ -1 +1,3 @@ // 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 1ba87d8a26..d9d243d7e8 100644 --- a/framework-t/api/removed.txt +++ b/framework-t/api/removed.txt @@ -1,4 +1,6 @@ // 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 53ad834e4a..9bdb59556d 100644 --- a/framework-t/api/system-current.txt +++ b/framework-t/api/system-current.txt @@ -1,4 +1,6 @@ // 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/system-removed.txt b/framework-t/api/system-removed.txt index d802177e24..14191ebcb0 100644 --- a/framework-t/api/system-removed.txt +++ b/framework-t/api/system-removed.txt @@ -1 +1,3 @@ // 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 6860c3c389..4f00977fa2 100644 --- a/framework/api/current.txt +++ b/framework/api/current.txt @@ -1,4 +1,6 @@ // 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 193bd920d2..ac57c10841 100644 --- a/framework/api/module-lib-current.txt +++ b/framework/api/module-lib-current.txt @@ -1,4 +1,6 @@ // 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 d802177e24..14191ebcb0 100644 --- a/framework/api/module-lib-removed.txt +++ b/framework/api/module-lib-removed.txt @@ -1 +1,3 @@ // 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 303a1e6173..f5da46a0b6 100644 --- a/framework/api/removed.txt +++ b/framework/api/removed.txt @@ -1,4 +1,6 @@ // 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 4a2ed8a2a8..cd120e9f0b 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -1,4 +1,6 @@ // 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/system-removed.txt b/framework/api/system-removed.txt index d802177e24..14191ebcb0 100644 --- a/framework/api/system-removed.txt +++ b/framework/api/system-removed.txt @@ -1 +1,3 @@ // Signature format: 2.0 +// - add-additional-overrides=no +// - migrating=Migration in progress see b/299366704