Add NullabilityAnnotationsDetector to AndroidXIssueRegistry
Test: N/A
Bug: 221275214
Change-Id: I63b1872ab8ef279a7943021e35d70fe76f33b9d6
diff --git a/car/app/app/lint-baseline.xml b/car/app/app/lint-baseline.xml
index f1c9205..c803e93 100644
--- a/car/app/app/lint-baseline.xml
+++ b/car/app/app/lint-baseline.xml
@@ -370,4 +370,13 @@
file="src/main/java/androidx/car/app/serialization/Bundler.java"/>
</issue>
+ <issue
+ id="NullabilityAnnotationsDetector"
+ message="Use @androidx.annotation.NonNull instead of @org.jetbrains.annotations.NotNull"
+ errorLine1=" public void sendPanModeChanged(boolean isInPanMode, @NonNull @NotNull OnDoneCallback callback) {"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/main/java/androidx/car/app/navigation/model/PanModeDelegateImpl.java"/>
+ </issue>
+
</issues>
diff --git a/lint-checks/lint-baseline.xml b/lint-checks/lint-baseline.xml
index 69e3984..6c29641 100644
--- a/lint-checks/lint-baseline.xml
+++ b/lint-checks/lint-baseline.xml
@@ -91,4 +91,20 @@
file="integration-tests/src/main/java/androidx/PrivateConstructorForUtilityClassJava.java"/>
</issue>
+ <issue
+ id="NullabilityAnnotationsDetector"
+ message="Use @androidx.annotation.NonNull instead of @org.jetbrains.annotations.NotNull"
+ errorLine1=" private void method1(@NotNull String arg) {"
+ errorLine2=" ~~~~~~~~">
+ <location file="integration-tests/src/main/java/androidx/NullabilityAnnotationsJava.java"/>
+ </issue>
+
+ <issue
+ id="NullabilityAnnotationsDetector"
+ message="Use @androidx.annotation.Nullable instead of @org.jetbrains.annotations.Nullable"
+ errorLine1=" private void method2(@Nullable String arg) {"
+ errorLine2=" ~~~~~~~~~">
+ <location file="integration-tests/src/main/java/androidx/NullabilityAnnotationsJava.java"/>
+ </issue>
+
</issues>
diff --git a/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt b/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
index 56b0124..493c4c8 100644
--- a/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
+++ b/lint-checks/src/main/java/androidx/build/lint/AndroidXIssueRegistry.kt
@@ -62,7 +62,8 @@
PrivateConstructorForUtilityClassDetector.ISSUE,
ClassVerificationFailureDetector.ISSUE,
IdeaSuppressionDetector.ISSUE,
- CameraXQuirksClassDetector.ISSUE
+ CameraXQuirksClassDetector.ISSUE,
+ NullabilityAnnotationsDetector.ISSUE,
)
}
}
diff --git a/samples/Support7Demos/lint-baseline.xml b/samples/Support7Demos/lint-baseline.xml
index 73e649d..eb6a03c 100644
--- a/samples/Support7Demos/lint-baseline.xml
+++ b/samples/Support7Demos/lint-baseline.xml
@@ -5024,4 +5024,31 @@
file="src/main/java/com/example/android/supportv7/app/ToolbarUsage.java"/>
</issue>
+ <issue
+ id="NullabilityAnnotationsDetector"
+ message="Use @androidx.annotation.NonNull instead of @org.jetbrains.annotations.NotNull"
+ errorLine1=" @NotNull"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/main/java/com/example/android/supportv7/widget/RemoveLargeItemsDemo.java"/>
+ </issue>
+
+ <issue
+ id="NullabilityAnnotationsDetector"
+ message="Use @androidx.annotation.NonNull instead of @org.jetbrains.annotations.NotNull"
+ errorLine1=" public MyViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/main/java/com/example/android/supportv7/widget/RemoveLargeItemsDemo.java"/>
+ </issue>
+
+ <issue
+ id="NullabilityAnnotationsDetector"
+ message="Use @androidx.annotation.NonNull instead of @org.jetbrains.annotations.NotNull"
+ errorLine1=" public void onBindViewHolder(@NotNull MyViewHolder myViewHolder, int position) {"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/main/java/com/example/android/supportv7/widget/RemoveLargeItemsDemo.java"/>
+ </issue>
+
</issues>
diff --git a/wear/watchface/watchface-data/lint-baseline.xml b/wear/watchface/watchface-data/lint-baseline.xml
new file mode 100644
index 0000000..11bdc2c
--- /dev/null
+++ b/wear/watchface/watchface-data/lint-baseline.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<issues format="6" by="lint 7.3.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (7.3.0-alpha07)" variant="all" version="7.3.0-alpha07">
+
+ <issue
+ id="NullabilityAnnotationsDetector"
+ message="Use @androidx.annotation.NonNull instead of @org.jetbrains.annotations.NotNull"
+ errorLine1=" @NotNull"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/main/java/android/support/wearable/watchface/accessibility/ContentDescriptionLabel.java"/>
+ </issue>
+
+</issues>
\ No newline at end of file
diff --git a/wear/wear/lint-baseline.xml b/wear/wear/lint-baseline.xml
index f7c3f18..3aea4c8 100644
--- a/wear/wear/lint-baseline.xml
+++ b/wear/wear/lint-baseline.xml
@@ -2047,4 +2047,13 @@
file="src/main/java/androidx/wear/widget/WearableRecyclerView.java"/>
</issue>
+ <issue
+ id="NullabilityAnnotationsDetector"
+ message="Use @androidx.annotation.NonNull instead of @org.jetbrains.annotations.NotNull"
+ errorLine1=" void disable(@NotNull DismissibleFrameLayout layout) {"
+ errorLine2=" ~~~~~~~~">
+ <location
+ file="src/main/java/androidx/wear/widget/BackButtonDismissController.java"/>
+ </issue>
+
</issues>
