Revert "Replacing @Nullable with @RecentlyNullable for apis annotated since API 28"
This reverts commit 1b51142eb629a300727197f5bebe32c208edb0b6 now that nullability of non-android APIs will remain as @Nullable/@NonNull rather than @RecentlyNullable/@RecentlyNonNull
Bug: 141748642
Test: m api-stubs-docs &&
cd out/target/common && mv docs docs-new && unzip docs-new/api-stubs-docs-stubs.srcjar -d docs-new/api-stubs-docs-stubs.srcjar_unzipped && cd - &&
cd frameworks/base && git checkout HEAD^ && cd - && la m api-stubs-docs &&
cd out/target/common && mv docs docs-old && unzip docs-old/api-stubs-docs-stubs.srcjar -d docs-old/api-stubs-docs-stubs.srcjar_unzipped &&
diff -q -x "*.html" -r docs-old/ docs-new # And notice that all of the changes are in android/ or in dalvik/
Change-Id: Iecad0acdd910de4a1270e3ccfe34fe378d22a113
diff --git a/Android.bp b/Android.bp
index a3132c5..610da61 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1034,7 +1034,7 @@
"sdk-dir",
"api-versions-jars-dir",
],
- previous_api: ":last-released-public-api-for-metalava-annotations",
+ previous_api: ":last-released-public-api",
merge_annotations_dirs: [
"metalava-manual",
],
@@ -1091,7 +1091,7 @@
libs: ["framework-internal-utils"],
installable: false,
annotations_enabled: true,
- previous_api: ":last-released-public-api-for-metalava-annotations",
+ previous_api: ":last-released-public-api",
merge_annotations_dirs: [
"metalava-manual",
],
@@ -1427,7 +1427,7 @@
installable: false,
sdk_version: "core_platform",
annotations_enabled: true,
- previous_api: ":last-released-public-api-for-metalava-annotations",
+ previous_api: ":last-released-public-api",
merge_annotations_dirs: [
"metalava-manual",
],