Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Ie7f5faac81799b46f3458ef1332144cfbee8b8a7
Change-Id: I6779d4013ad03c8541cd2316a043c7ebbace08ca
diff --git a/src/main/java/com/android/tools/metalava/ApiLint.kt b/src/main/java/com/android/tools/metalava/ApiLint.kt
index ce86222..c3dedef 100644
--- a/src/main/java/com/android/tools/metalava/ApiLint.kt
+++ b/src/main/java/com/android/tools/metalava/ApiLint.kt
@@ -85,7 +85,7 @@
import com.android.tools.metalava.Issues.INTERFACE_CONSTANT
import com.android.tools.metalava.Issues.INTERNAL_CLASSES
import com.android.tools.metalava.Issues.INTERNAL_FIELD
-import com.android.tools.metalava.Issues.INVALID_NULLABILITY
+import com.android.tools.metalava.Issues.INVALID_NULLABILITY_OVERRIDE
import com.android.tools.metalava.Issues.Issue
import com.android.tools.metalava.Issues.KOTLIN_OPERATOR
import com.android.tools.metalava.Issues.LISTENER_INTERFACE
@@ -1613,9 +1613,9 @@
if (item.containingMethod().isConstructor()) return
if (item.modifiers.isNonNull()) {
if (anySuperParameterLacksNullnessInfo(item)) {
- report(INVALID_NULLABILITY, item, "Invalid nullability on parameter `${item.name()}` in method `${item.parent()?.name()}`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.")
+ report(INVALID_NULLABILITY_OVERRIDE, item, "Invalid nullability on parameter `${item.name()}` in method `${item.parent()?.name()}`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.")
} else if (anySuperParameterIsNullable(item)) {
- report(INVALID_NULLABILITY, item, "Invalid nullability on parameter `${item.name()}` in method `${item.parent()?.name()}`. Parameters of overrides cannot be NonNull if super parameter is Nullable.")
+ report(INVALID_NULLABILITY_OVERRIDE, item, "Invalid nullability on parameter `${item.name()}` in method `${item.parent()?.name()}`. Parameters of overrides cannot be NonNull if super parameter is Nullable.")
}
}
}
@@ -1624,9 +1624,9 @@
if (item.isConstructor()) return
if (item.modifiers.isNullable()) {
if (anySuperMethodLacksNullnessInfo(item)) {
- report(INVALID_NULLABILITY, item, "Invalid nullability on method `${item.name()}` return. Overrides of unannotated super method cannot be Nullable.")
+ report(INVALID_NULLABILITY_OVERRIDE, item, "Invalid nullability on method `${item.name()}` return. Overrides of unannotated super method cannot be Nullable.")
} else if (anySuperMethodIsNonNull(item)) {
- report(INVALID_NULLABILITY, item, "Invalid nullability on method `${item.name()}` return. Overrides of NonNull methods cannot be Nullable.")
+ report(INVALID_NULLABILITY_OVERRIDE, item, "Invalid nullability on method `${item.name()}` return. Overrides of NonNull methods cannot be Nullable.")
}
}
}
diff --git a/src/main/java/com/android/tools/metalava/Issues.kt b/src/main/java/com/android/tools/metalava/Issues.kt
index 231d31c..1c356fa 100644
--- a/src/main/java/com/android/tools/metalava/Issues.kt
+++ b/src/main/java/com/android/tools/metalava/Issues.kt
@@ -210,7 +210,7 @@
val DOCUMENT_EXCEPTIONS = Issue(Severity.ERROR, Category.API_LINT, "docs-throws")
val FORBIDDEN_SUPER_CLASS = Issue(Severity.ERROR, Category.API_LINT)
val MISSING_NULLABILITY = Issue(Severity.ERROR, Category.API_LINT, "annotations")
- val INVALID_NULLABILITY = Issue(Severity.ERROR, Category.API_LINT, "annotations-nullability-overrides")
+ val INVALID_NULLABILITY_OVERRIDE = Issue(Severity.ERROR, Category.API_LINT, "annotations-nullability-overrides")
val MUTABLE_BARE_FIELD = Issue(Severity.ERROR, Category.API_LINT, "mutable-bare-field")
val INTERNAL_FIELD = Issue(Severity.ERROR, Category.API_LINT, "internal-fields")
val PUBLIC_TYPEDEF = Issue(Severity.ERROR, Category.API_LINT, "no-public-typedefs")
diff --git a/src/test/java/com/android/tools/metalava/ApiLintTest.kt b/src/test/java/com/android/tools/metalava/ApiLintTest.kt
index 41ced4d..2ac7c0a 100644
--- a/src/test/java/com/android/tools/metalava/ApiLintTest.kt
+++ b/src/test/java/com/android/tools/metalava/ApiLintTest.kt
@@ -3562,8 +3562,8 @@
fun `No nullability allowed on overrides of unannotated methods or parameters`() {
check(
expectedIssues = """
- src/test/pkg/Foo.java:10: error: Invalid nullability on method `bar` return. Overrides of unannotated super method cannot be Nullable. [InvalidNullability] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
- src/test/pkg/Foo.java:10: error: Invalid nullability on parameter `baz` in method `bar`. Parameters of overrides cannot be NonNull if the super parameter is unannotated. [InvalidNullability] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
+ src/test/pkg/Foo.java:10: error: Invalid nullability on method `bar` return. Overrides of unannotated super method cannot be Nullable. [InvalidNullabilityOverride] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
+ src/test/pkg/Foo.java:10: error: Invalid nullability on parameter `baz` in method `bar`. Parameters of overrides cannot be NonNull if the super parameter is unannotated. [InvalidNullabilityOverride] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
src/test/pkg/Foo.java:5: error: Missing nullability on method `bar` return [MissingNullability] [See https://s.android.com/api-guidelines#annotations]
src/test/pkg/Foo.java:5: error: Missing nullability on parameter `baz` in method `bar` [MissingNullability] [See https://s.android.com/api-guidelines#annotations]
""",
@@ -3596,7 +3596,7 @@
check(
expectedIssues = """
- src/test/pkg/Bar.kt:5: error: Invalid nullability on parameter `baz` in method `bar`. Parameters of overrides cannot be NonNull if the super parameter is unannotated. [InvalidNullability] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
+ src/test/pkg/Bar.kt:5: error: Invalid nullability on parameter `baz` in method `bar`. Parameters of overrides cannot be NonNull if the super parameter is unannotated. [InvalidNullabilityOverride] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
src/test/pkg/Foo.java:5: error: Missing nullability on method `bar` return [MissingNullability] [See https://s.android.com/api-guidelines#annotations]
src/test/pkg/Foo.java:5: error: Missing nullability on parameter `baz` in method `bar` [MissingNullability] [See https://s.android.com/api-guidelines#annotations]
""",
@@ -3633,7 +3633,7 @@
fun `Overrides of non-null methods cannot be nullable`() {
check(
expectedIssues = """
- src/test/pkg/Foo.java:9: error: Invalid nullability on method `bar` return. Overrides of NonNull methods cannot be Nullable. [InvalidNullability] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
+ src/test/pkg/Foo.java:9: error: Invalid nullability on method `bar` return. Overrides of NonNull methods cannot be Nullable. [InvalidNullabilityOverride] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
""",
apiLint = "",
expectedFail = DefaultLintErrorMessage,
@@ -3662,7 +3662,7 @@
fun `Overrides of nullable parameters cannot be non-null`() {
check(
expectedIssues = """
- src/test/pkg/Foo.java:10: error: Invalid nullability on parameter `baz` in method `bar`. Parameters of overrides cannot be NonNull if super parameter is Nullable. [InvalidNullability] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
+ src/test/pkg/Foo.java:10: error: Invalid nullability on parameter `baz` in method `bar`. Parameters of overrides cannot be NonNull if super parameter is Nullable. [InvalidNullabilityOverride] [See https://s.android.com/api-guidelines#annotations-nullability-overrides]
""",
apiLint = "",
expectedFail = DefaultLintErrorMessage,