From a6a28934e93fd607035ef378f0d25f1363be5d20 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 10 Oct 2023 17:11:25 +0100 Subject: 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 (cherry picked from https://android-review.googlesource.com/q/commit:caab77d07da047fdb6dc75728b760996b4b48ae2) Merged-In: Ie7635e0b7ae04ca348ca3d1e3a339133def0ce3b Change-Id: Ie7635e0b7ae04ca348ca3d1e3a339133def0ce3b --- 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 ++ service/api/system-server-current.txt | 2 ++ service/api/system-server-removed.txt | 2 ++ 8 files changed, 16 insertions(+) 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 739f954..782934f 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.provider { public final class DeviceConfig { 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 cfe7cf7..db1f990 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.provider { public final class DeviceConfig { 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/service/api/system-server-current.txt b/service/api/system-server-current.txt index 722ace1..f464685 100644 --- a/service/api/system-server-current.txt +++ b/service/api/system-server-current.txt @@ -1,4 +1,6 @@ // Signature format: 2.0 +// - add-additional-overrides=no +// - migrating=Migration in progress see b/299366704 package com.android.server.deviceconfig { public class DeviceConfigInit { diff --git a/service/api/system-server-removed.txt b/service/api/system-server-removed.txt index d802177..14191eb 100644 --- a/service/api/system-server-removed.txt +++ b/service/api/system-server-removed.txt @@ -1 +1,3 @@ // Signature format: 2.0 +// - add-additional-overrides=no +// - migrating=Migration in progress see b/299366704 -- cgit v1.2.3