diff options
| author | 2023-10-10 17:51:56 +0100 | |
|---|---|---|
| committer | 2023-10-10 17:51:56 +0100 | |
| commit | 9c9709abdeccc109988106729eb29af39d266a3e (patch) | |
| tree | e6bb1b345ed14041c72f3a5a694f34f81ac913b3 | |
| parent | 6d88d76a10c842038a54fddde1abe93aaf2eea46 (diff) | |
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: Ia1562532938bc078b739dfe8b3910b6c741cde72
| -rw-r--r-- | framework-s/api/current.txt | 2 | ||||
| -rw-r--r-- | framework-s/api/module-lib-current.txt | 2 | ||||
| -rw-r--r-- | framework-s/api/module-lib-removed.txt | 2 | ||||
| -rw-r--r-- | framework-s/api/removed.txt | 2 | ||||
| -rw-r--r-- | framework-s/api/system-current.txt | 2 | ||||
| -rw-r--r-- | framework-s/api/system-removed.txt | 2 | ||||
| -rw-r--r-- | framework/api/current.txt | 2 | ||||
| -rw-r--r-- | framework/api/module-lib-current.txt | 2 | ||||
| -rw-r--r-- | framework/api/module-lib-removed.txt | 2 | ||||
| -rw-r--r-- | framework/api/removed.txt | 2 | ||||
| -rw-r--r-- | framework/api/system-current.txt | 2 | ||||
| -rw-r--r-- | framework/api/system-removed.txt | 2 |
12 files changed, 24 insertions, 0 deletions
diff --git a/framework-s/api/current.txt b/framework-s/api/current.txt index d54af92f5..50e7d6eb1 100644 --- a/framework-s/api/current.txt +++ b/framework-s/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.role { public final class RoleManager { diff --git a/framework-s/api/module-lib-current.txt b/framework-s/api/module-lib-current.txt index 80f1cde45..6d4f7764e 100644 --- a/framework-s/api/module-lib-current.txt +++ b/framework-s/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.role { public class RoleFrameworkInitializer { diff --git a/framework-s/api/module-lib-removed.txt b/framework-s/api/module-lib-removed.txt index d802177e2..14191ebcb 100644 --- a/framework-s/api/module-lib-removed.txt +++ b/framework-s/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-s/api/removed.txt b/framework-s/api/removed.txt index d802177e2..14191ebcb 100644 --- a/framework-s/api/removed.txt +++ b/framework-s/api/removed.txt @@ -1 +1,3 @@ // Signature format: 2.0 +// - add-additional-overrides=no +// - migrating=Migration in progress see b/299366704 diff --git a/framework-s/api/system-current.txt b/framework-s/api/system-current.txt index 9545356a4..7b3f99709 100644 --- a/framework-s/api/system-current.txt +++ b/framework-s/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.role { public interface OnRoleHoldersChangedListener { diff --git a/framework-s/api/system-removed.txt b/framework-s/api/system-removed.txt index d802177e2..14191ebcb 100644 --- a/framework-s/api/system-removed.txt +++ b/framework-s/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 d802177e2..14191ebcb 100644 --- a/framework/api/current.txt +++ b/framework/api/current.txt @@ -1 +1,3 @@ // Signature format: 2.0 +// - add-additional-overrides=no +// - migrating=Migration in progress see b/299366704 diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt index d802177e2..14191ebcb 100644 --- a/framework/api/module-lib-current.txt +++ b/framework/api/module-lib-current.txt @@ -1 +1,3 @@ // Signature format: 2.0 +// - add-additional-overrides=no +// - migrating=Migration in progress see b/299366704 diff --git a/framework/api/module-lib-removed.txt b/framework/api/module-lib-removed.txt index d802177e2..14191ebcb 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 d802177e2..14191ebcb 100644 --- a/framework/api/removed.txt +++ b/framework/api/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/system-current.txt b/framework/api/system-current.txt index d802177e2..14191ebcb 100644 --- a/framework/api/system-current.txt +++ b/framework/api/system-current.txt @@ -1 +1,3 @@ // Signature format: 2.0 +// - add-additional-overrides=no +// - migrating=Migration in progress see b/299366704 diff --git a/framework/api/system-removed.txt b/framework/api/system-removed.txt index d802177e2..14191ebcb 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 |