diff options
| author | Anton Hansson <hansson@google.com> | 2022-11-09 19:39:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-11-09 19:39:22 +0000 |
| commit | e033a64642434b9ffc926fde0b83a809bc599174 (patch) | |
| tree | 05d9ae79766a428e9e1434c8424720e634bcb1b8 | |
| parent | 2fd002f6cbeb3c8f09e8de56f6f09f2d157740bc (diff) | |
| parent | 6ce4a72f01028bf788d0d68a863b291b8d456830 (diff) | |
| download | sdk-e033a64642434b9ffc926fde0b83a809bc599174.tar.gz | |
Merge "Manually tweak framework-adservices 4 and 5" into tm-mainline-prod
4 files changed, 14 insertions, 8 deletions
diff --git a/extensions/4/public/api/framework-adservices-removed.txt b/extensions/4/public/api/framework-adservices-removed.txt index d802177e2..01c8844f1 100644 --- a/extensions/4/public/api/framework-adservices-removed.txt +++ b/extensions/4/public/api/framework-adservices-removed.txt @@ -1 +1,8 @@ // Signature format: 2.0 +package android.adservices { + + public class AdServicesVersion { + field public static final int API_VERSION; + } + +} diff --git a/extensions/4/public/api/framework-adservices.txt b/extensions/4/public/api/framework-adservices.txt index d146378b7..ff975f0b5 100644 --- a/extensions/4/public/api/framework-adservices.txt +++ b/extensions/4/public/api/framework-adservices.txt @@ -5,10 +5,6 @@ package android.adservices { method public static boolean isAdServicesStateEnabled(); } - public class AdServicesVersion { - field public static final int API_VERSION; - } - } package android.adservices.adid { diff --git a/extensions/5/public/api/framework-adservices-removed.txt b/extensions/5/public/api/framework-adservices-removed.txt index d802177e2..01c8844f1 100644 --- a/extensions/5/public/api/framework-adservices-removed.txt +++ b/extensions/5/public/api/framework-adservices-removed.txt @@ -1 +1,8 @@ // Signature format: 2.0 +package android.adservices { + + public class AdServicesVersion { + field public static final int API_VERSION; + } + +} diff --git a/extensions/5/public/api/framework-adservices.txt b/extensions/5/public/api/framework-adservices.txt index ff9e4ecf9..eb1a37aa5 100644 --- a/extensions/5/public/api/framework-adservices.txt +++ b/extensions/5/public/api/framework-adservices.txt @@ -5,10 +5,6 @@ package android.adservices { method public static boolean isAdServicesStateEnabled(); } - public class AdServicesVersion { - field public static final int API_VERSION; - } - } package android.adservices.adid { |