Snap for 9276597 from e033a64642434b9ffc926fde0b83a809bc599174 to mainline-tzdata4-release
Change-Id: Icff2953126db98f1a0121dabb98430692f4013af
diff --git a/34/public/api/android-incompatibilities.txt b/34/public/api/android-incompatibilities.txt
new file mode 100644
index 0000000..0e2b324
--- /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
similarity index 100%
rename from 33/public/api/art-incompatibilities.txt
rename to 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 0000000..0e2b324
--- /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 dea0669..9edff91 100644
--- a/Android.bp
+++ b/Android.bp
@@ -128,7 +128,7 @@
"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 d802177..01c8844 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 d146378..ff975f0 100644
--- a/extensions/4/public/api/framework-adservices.txt
+++ b/extensions/4/public/api/framework-adservices.txt
@@ -5,10 +5,6 @@
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 d802177..01c8844 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 ff9e4ec..eb1a37a 100644
--- a/extensions/5/public/api/framework-adservices.txt
+++ b/extensions/5/public/api/framework-adservices.txt
@@ -5,10 +5,6 @@
method public static boolean isAdServicesStateEnabled();
}
- public class AdServicesVersion {
- field public static final int API_VERSION;
- }
-
}
package android.adservices.adid {
