commit b4598567fc112edffba6c688e6d9b602b3dce6c3
author Jacky Wang <jiannan@google.com> Thu Nov 23 20:23:26 2023 +0800
committer Jacky Wang <jiannan@google.com> Thu Nov 30 21:36:24 2023 +0800
tree d6e685ee11d87552bc88efac1010f2a18ca1e8b0
parent 094dfcc5d8210dd694982aec94a8d74ca81087ae

Re-enable nullaway plugin

Bug: 307330031
Test: make Settings RUN_ERROR_PRONE=true
Change-Id: I6445b588f11bc01e6d885f73ffa35329b5db2ab2

Android.bp

diff --git a/Android.bp b/Android.bp
index b456a72..9b4cfde 100644
--- a/Android.bp
+++ b/Android.bp
@@ -107,13 +107,12 @@
 
     plugins: ["androidx.room_room-compiler-plugin"],
 
-    // TODO: b/307330031 - Re-enable the nullaway plugin when the issue is fixed.
-    // errorprone: {
-    //     extra_check_modules: ["//external/nullaway:nullaway_plugin"],
-    //     javacflags: [
-    //         "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
-    //     ],
-    // },
+    errorprone: {
+        extra_check_modules: ["//external/nullaway:nullaway_plugin"],
+        javacflags: [
+            "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
+        ],
+    },
 
     libs: [
         "telephony-common",