Commit 6855f1d4 authored Oct 09, 2019 by Jeff Gaston

Revert "Replacing @Nullable with @RecentlyNullable for apis annotated since API 28"

This reverts commit 1b51142e 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

parent 235c9203

Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -1034,7 +1034,7 @@ stubs_defaults {
		"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 @@ stubs_defaults {
		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 @@ droidstubs {
		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",
		],