drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jeff Gaston 2019-10-09 18:37:18 -04:00
parent 235c9203fe
commit 6855f1d484
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Android.bp
View File

@ -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",
],