diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-10 08:49:16 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-10 08:49:16 +0000 |
| commit | 1c997a0973c6c3a1a46aa012017ce57a132a1fec (patch) | |
| tree | 05d9ae79766a428e9e1434c8424720e634bcb1b8 | |
| parent | 16280147d4982141992d01614a88072d2227d823 (diff) | |
| parent | e033a64642434b9ffc926fde0b83a809bc599174 (diff) | |
| download | sdk-1c997a0973c6c3a1a46aa012017ce57a132a1fec.tar.gz | |
Snap for 9276597 from e033a64642434b9ffc926fde0b83a809bc599174 to mainline-tzdata4-releaseaml_tz4_331314030aml_tz4_331314020aml_tz4_331314010
Change-Id: Icff2953126db98f1a0121dabb98430692f4013af
| -rw-r--r-- | 34/public/api/android-incompatibilities.txt | 3 | ||||
| -rw-r--r-- | 34/public/api/art-incompatibilities.txt (renamed from 33/public/api/art-incompatibilities.txt) | 0 | ||||
| -rw-r--r-- | 34/public/api/framework-adservices-incompatibilities.txt | 3 | ||||
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | extensions/4/public/api/framework-adservices-removed.txt | 7 | ||||
| -rw-r--r-- | extensions/4/public/api/framework-adservices.txt | 4 | ||||
| -rw-r--r-- | extensions/5/public/api/framework-adservices-removed.txt | 7 | ||||
| -rw-r--r-- | extensions/5/public/api/framework-adservices.txt | 4 |
8 files changed, 21 insertions, 9 deletions
diff --git a/34/public/api/android-incompatibilities.txt b/34/public/api/android-incompatibilities.txt new file mode 100644 index 000000000..0e2b3242d --- /dev/null +++ b/34/public/api/android-incompatibilities.txt @@ -0,0 +1,3 @@ +// Baseline format: 1.0 +RemovedClass: android.adservices.AdServicesVersion: + Removed class android.adservices.AdServicesVersion diff --git a/33/public/api/art-incompatibilities.txt b/34/public/api/art-incompatibilities.txt index 15044d362..15044d362 100644 --- a/33/public/api/art-incompatibilities.txt +++ b/34/public/api/art-incompatibilities.txt diff --git a/34/public/api/framework-adservices-incompatibilities.txt b/34/public/api/framework-adservices-incompatibilities.txt new file mode 100644 index 000000000..0e2b3242d --- /dev/null +++ b/34/public/api/framework-adservices-incompatibilities.txt @@ -0,0 +1,3 @@ +// Baseline format: 1.0 +RemovedClass: android.adservices.AdServicesVersion: + Removed class android.adservices.AdServicesVersion diff --git a/Android.bp b/Android.bp index dea06690c..9edff9168 100644 --- a/Android.bp +++ b/Android.bp @@ -128,7 +128,7 @@ prebuilt_apis { "current", ], extensions_dir: "extensions", - next_api_dir: "33", + next_api_dir: "34", imports_sdk_version: "none", imports_compile_dex: true, } 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 { |