summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2023-10-10 17:51:56 +0100
committerPaul Duffin <paulduffin@google.com>2023-10-10 17:51:56 +0100
commita1ad79b15017899c7d420f048ee7dd3478f1d0d8 (patch)
tree225ecc6a7965c84b995fdd903f00e379229b830a
parent9788a129b3fefbffcb51e552b36954245a695ee0 (diff)
downloadScheduling-a1ad79b15017899c7d420f048ee7dd3478f1d0d8.tar.gz
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: I16cef4319b4a6331196a225c547f65e9baff185e
-rw-r--r--framework/api/current.txt2
-rw-r--r--framework/api/module-lib-current.txt2
-rw-r--r--framework/api/module-lib-removed.txt2
-rw-r--r--framework/api/removed.txt2
-rw-r--r--framework/api/system-current.txt2
-rw-r--r--framework/api/system-removed.txt2
-rw-r--r--framework/api/test-current.txt3
-rw-r--r--framework/api/test-removed.txt3
8 files changed, 18 insertions, 0 deletions
diff --git a/framework/api/current.txt b/framework/api/current.txt
index d802177..14191eb 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 9356eb7..bec991d 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.scheduling {
public class SchedulingFrameworkInitializer {
diff --git a/framework/api/module-lib-removed.txt b/framework/api/module-lib-removed.txt
index d802177..14191eb 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 d802177..14191eb 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 5b76cd4..323c9e4 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.scheduling {
public final class RebootReadinessManager {
diff --git a/framework/api/system-removed.txt b/framework/api/system-removed.txt
index d802177..14191eb 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
diff --git a/framework/api/test-current.txt b/framework/api/test-current.txt
index e69de29..14191eb 100644
--- a/framework/api/test-current.txt
+++ b/framework/api/test-current.txt
@@ -0,0 +1,3 @@
+// Signature format: 2.0
+// - add-additional-overrides=no
+// - migrating=Migration in progress see b/299366704
diff --git a/framework/api/test-removed.txt b/framework/api/test-removed.txt
index e69de29..14191eb 100644
--- a/framework/api/test-removed.txt
+++ b/framework/api/test-removed.txt
@@ -0,0 +1,3 @@
+// Signature format: 2.0
+// - add-additional-overrides=no
+// - migrating=Migration in progress see b/299366704