Update errorprone to 2.11.0 am: c2676a8fd1

Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1971484

Change-Id: I76ea605d58d9d26c5fe04edd3c1096f5ede2775d

28 files changed, 82 insertions, 308 deletions

diff --git a/Android.bp b/Android.bp
index 2188f18..496770a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,7 +36,7 @@ java_import {
     name: "error_prone_annotations",
     host_supported: true,
     visibility: ["//visibility:public"],
-    jars: ["error_prone/error_prone_annotations-2.10.0.jar"],
+    jars: ["error_prone/error_prone_annotations-2.11.0.jar"],
     min_sdk_version : "29",
     apex_available: [
         "//apex_available:anyapex",
@@ -48,8 +48,8 @@ java_import {
     name: "error_prone_core_jars",
     host_supported: true,
     jars: [
-        "error_prone/error_prone_core-2.10.0-with-dependencies.jar",
-        "error_prone/error_prone_annotations-2.10.0.jar",
+        "error_prone/error_prone_core-2.11.0-with-dependencies.jar",
+        "error_prone/error_prone_annotations-2.11.0.jar",
     ],
 }
 
@@ -70,7 +70,7 @@ java_import {
     host_supported: true,
     visibility: ["//visibility:public"],
     jars: [
-        "error_prone/error_prone_test_helpers-2.10.0.jar",
+        "error_prone/error_prone_test_helpers-2.11.0.jar",
         "jimfs/jimfs-1.1.jar",
     ],
 }
diff --git a/checkerframework/METADATA b/checkerframework/METADATA
index c1adae1..8989d3e 100644
--- a/checkerframework/METADATA
+++ b/checkerframework/METADATA
@@ -18,5 +18,5 @@ third_party {
     value: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.15.0/javacutil-3.15.0-sources.jar"
   }
   version: "3.15.0"
-  last_upgrade_date { year: 2021 month: 11 day: 22}
+  last_upgrade_date { year: 2022 month: 2 day: 3}
 }
diff --git a/error_prone/METADATA b/error_prone/METADATA
index 98d6c0b..05198e2 100644
--- a/error_prone/METADATA
+++ b/error_prone/METADATA
@@ -10,8 +10,8 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.10.0/error_prone_core-2.10.0-with-dependencies.jar"
+    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.11.0/error_prone_core-2.11.0-with-dependencies.jar"
   }
-  version: "2.10.0"
-  last_upgrade_date { year: 2021 month: 11 day: 22}
+  version: "2.11.0"
+  last_upgrade_date { year: 2022 month: 2 day: 3}
 }
diff --git a/error_prone/error_prone_annotations-2.10.0.jar b/error_prone/error_prone_annotations-2.10.0.jar
deleted file mode 100644
index 2d1b543..0000000
--- a/error_prone/error_prone_annotations-2.10.0.jar
+++ /dev/null
diff --git a/error_prone/error_prone_annotations-2.10.0.jar.asc b/error_prone/error_prone_annotations-2.10.0.jar.asc
deleted file mode 100644
index 78d073c..0000000
--- a/error_prone/error_prone_annotations-2.10.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmGEWnkACgkQmiWcfuY2
-xe0pfA/+MUtXSn6PgMDUSBvAPJeeG+ECu/2gRz8se+0H3wXkoUDiJqfsWEsKZ44E
-MrWuxfzzxiiLCseIMMuIQrs8GNKG51eKnc1WQH24HbbegXRPGj3TsukMoCKvV/9D
-KQgasZyORmxXAnbE1c/verjU6iq0ROot/ukeSWCk1fPsZPvo6HZXaEb7LabkZvCz
-4FtSdx6oTOtMswzxVZbXEKtg9sRPZ9Aa4Ll7tK1U0EJudLJJEfheyikMRaiC95l/
-iBVne+at5xaMwATxvjMre46xfXzc0WG3JxNgnbj/6beZHTIPW/ZUMNiDEK4c3KkZ
-T+yB5YUe/6ydhDoOICseXVYIeOrLt/HMt48RiJBlnaQy1MVbbUvByjuImnMQLyvL
-vCBIAhuSCHgPh7HUPdxsRaY40KnipdLodNIEk/0DQm/szC53UT+mQ1Qn+RiFp40l
-D+pQU9Fq8h5cQjias4TYnWFKWDNBK3j4BXe5S347pFXH2gaJoiKmw3+O6RtOl6tV
-TEqAVOfsLX6TnT1j7lUyFYuDIyp9wXDZN2ZAASYA4xU8Lwz3D37zkXGwYm3/T0vK
-eOMhkws5fZhh55dEydRq8GS5zs77pmylysoH33jNK5iJiYjR2FE68FymW/WLirDx
-a8l2iffbijjvMpyKgAc1dlgSvOjwdYk2EzEgWb75yD7IqtCn1xk=
-=BTNu
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.10.0.jar.sha1 b/error_prone/error_prone_annotations-2.10.0.jar.sha1
deleted file mode 100644
index 3706d9e..0000000
--- a/error_prone/error_prone_annotations-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9bc20b94d3ac42489cf6ce1e42509c86f6f861a1
\ No newline at end of file
diff --git a/error_prone/error_prone_annotations-2.11.0.jar b/error_prone/error_prone_annotations-2.11.0.jar
new file mode 100644
index 0000000..bec7656
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.11.0.jar
diff --git a/error_prone/error_prone_annotations-2.11.0.jar.asc b/error_prone/error_prone_annotations-2.11.0.jar.asc
new file mode 100644
index 0000000..e6e8e96
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.11.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmHwSekACgkQmiWcfuY2
+xe0iHg//TcYXZFyLsObcxRq7n8CZ+byPJzytaddqts4buPlp1CDP6gUnKSQhHcnn
+IqVkLvNT8vylpNffqpVLHG6TVtwBln3iiFzIa+6pXLsZW2bPcWvFX2M6mKNeD39b
+lzIU2n9pOBsmGUi4uehajknAMtOi3tjeoOaqCQbjiH/lAfICwIO95MgoAO6rRA/0
+CrhuDgmhi/CoVfkxGRejnaXhKsrolr0CWr06Y78VEgciAJ/UqHWkIrf2oEoD6bdn
+IPnV2JsXqlsXHyoZcfw9f9k6r+CJh0oo8sUMSbx/mTwNdKCzw1wsQ6ZKrAuRlAuw
+IogI225Yp4DJaefs7/MKdJEhC2vHPajUZOVY3lFr3WHrVI0mt6/PKkCOCQ2VJSlr
+xwOZ5/mGFm8r4OnwTKgPnIXrKIyOPqiD/lsrGy1tTVvMlYd0cv6HlW/U7d9tlTCg
+caYEtoxR1Y14OMYQY8uL5Yoqr29Dq6lpSURVy0FtCqyxoDwnf7sxM8pHku/8FsC3
+G1pUu8k75mFV6aLtlYB3H1OxnIRLLvrRK5qkcWEhZngMjLmqQ5C4BfE2Ojnqeghe
+gawvFsp7rJEZPL0vzoEgGwcABIVs+FMFX/wbOb5vgUy3tU8niIaXnro43IsIGD+/
+nceva2aRKdfIYcsHJs1BqnC7U3Ony+hGrZM09dY5gCiPDgsYjlo=
+=gxdE
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.11.0.jar.sha1 b/error_prone/error_prone_annotations-2.11.0.jar.sha1
new file mode 100644
index 0000000..d319352
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.11.0.jar.sha1
@@ -0,0 +1 @@
+c5a0ace696d3f8b1c1d8cc036d8c03cc0cbe6b69
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.10.0-with-dependencies.jar.asc b/error_prone/error_prone_core-2.10.0-with-dependencies.jar.asc
deleted file mode 100644
index 8f57314..0000000
--- a/error_prone/error_prone_core-2.10.0-with-dependencies.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmGEWvkACgkQmiWcfuY2
-xe1HsQ/9GKk1doZSSnW1JKcYZaFp4wyNV9CyD+FkNbn7f6YS7vcFk+fZfI9kTuxc
-VxSvW6fqfuLUnoxaSZ1ldKjuBF9N+ip4j81d5gdSemePs5UkAZN2GSSZaYDB27UA
-EjWWMn6bvbpzhohhgASyvLncDmFDiIQbGK2hUcopPaErdIVuNGBGgkvvFzniUvLJ
-QrvNMdmqXNciT9DynRt4/cJnerVMy2BbmEAVoqbLftpaj/mcNIUZaUWUaJDjAKmR
-jUkFRS+fF00fJ3vWY0hA42iO3Mg9huW8EROHQlidbBSwJYY09S1lHv4OxmeEOkxE
-cS2XJqQbXGvdyg2BwF2RSxlCUMeCuvAgs98EhJ9XufcznmRjZbO0qtmGa9BnB7t5
-cH1MjYyWUE+0AbVE9qVZMdijhux6IbupArbNTjcAJepmVEuEqpz6YMg0BydyLDAm
-nnM1kfoM6KR8KcpX2UvEYtiRPyr514S3qOsj/GTRhtVmzEzqAMMKTQq6i/savV2Y
-s9xMACm4QzFrIc1Wp+46axCX2WFwRsomw8qwrCXW8lcEHklhlf6IVlqouYx2sYZB
-t4jSXv1rKAGWN6Y3xX5682gBizuaiNI6TyzjzCX2jug+1JOws8+WTRe21FEcQEN0
-Pmbseow7s8EiBWumbdJ9PQFKkozfKMFCIgoZsSGDie+bJMYnYdM=
-=cxst
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.10.0-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.10.0-with-dependencies.jar.sha1
deleted file mode 100644
index df3054a..0000000
--- a/error_prone/error_prone_core-2.10.0-with-dependencies.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-76fb795f4e20fe8dabc462e985dcdffd47a66381
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.10.0-with-dependencies.jar b/error_prone/error_prone_core-2.11.0-with-dependencies.jar
index b699d31..1007701 100644
--- a/error_prone/error_prone_core-2.10.0-with-dependencies.jar
+++ b/error_prone/error_prone_core-2.11.0-with-dependencies.jar
diff --git a/error_prone/error_prone_core-2.11.0-with-dependencies.jar.asc b/error_prone/error_prone_core-2.11.0-with-dependencies.jar.asc
new file mode 100644
index 0000000..31d8568
--- /dev/null
+++ b/error_prone/error_prone_core-2.11.0-with-dependencies.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmHwSqQACgkQmiWcfuY2
+xe3vMA/+NDnhFX2fwdGEoUbfszqN/yEtAicCeoiG8TwUA4QmJB1Htmf8+9U2SjO2
+Sgw7sJRGB6G9TR62oR0d0xmmYA92yha7v47jgli4zZd+zB+EcI9Lx4eh4l0WtWOM
+ldeeU5Fcztp72JQ9La7dIfcmIf0isdWMvVe381EFNqQ0DqMeArzuHNRrGOY04vKT
+1JxgDSMH8jhjP2kTqXlfPisoV0iizef2PuImFSvJ1mktbYyvJBu9uYZWTmyD1dwh
+bkuh9NZWXi5bHV0FAjKuUq9SxL3OpQc63rg7oz1WG513XanFDBpGVUIhETttgcOC
+JtbPxqy1C3jLT4JEtPlbw5/D3VBIufuEIlJCrDlL+nYmQGxo8T0v8SSq7nE2AhHz
+UqiNB2o1dDOEJc7Cdyj6ZKLmlsGwQfZg5FW4jJS8UA00t8//OOH85TFvr4YpxOWY
+vXncUXau5EEhhIacEzs6yPUMeU3xjjGCr/Zd9tu1RrRnlF8iC5tJxl5faO2kLbv4
+8UtRMnI+dzHnx7g8XBA9NdKZfdUMj6zqa9X1oYLElRXQb3f+Tjykw1pVcF6TIZ+n
+NJIFRSWTe7RbKHr3GeHzHUHZfIyW10HK3fCpOo64Jrr2uXm3U7zgaz2J7JP7ExuH
+AN8dGgG1wDTY1ifzLDJYMyB/5N5034rbWhfwNZMnKV+0qeCHMy8=
+=6+Xp
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.11.0-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.11.0-with-dependencies.jar.sha1
new file mode 100644
index 0000000..310674f
--- /dev/null
+++ b/error_prone/error_prone_core-2.11.0-with-dependencies.jar.sha1
@@ -0,0 +1 @@
+eac2380d91c632aaa762c35b6c2e7456a155c992
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.10.0.jar b/error_prone/error_prone_test_helpers-2.10.0.jar
deleted file mode 100644
index 6da884d..0000000
--- a/error_prone/error_prone_test_helpers-2.10.0.jar
+++ /dev/null
diff --git a/error_prone/error_prone_test_helpers-2.10.0.jar.asc b/error_prone/error_prone_test_helpers-2.10.0.jar.asc
deleted file mode 100644
index 1297521..0000000
--- a/error_prone/error_prone_test_helpers-2.10.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmGEWo8ACgkQmiWcfuY2
-xe1Xtg/9EgocMpsaCyVwWFstbgM2pAtaMEdJ3nOq79kpWr3kYP2iTyZAmrQ3Onoi
-D0PudSUgawtAsRaz2oYbiAzh3tKYBYMq7BkeLOXaQlIZjPJKAvMn7YrCKV7wdvJI
-BfYY2SW/tjM8n39lXW1pSE2IHaqNIf3elqFUGNbbVyJTyJuwwvMu+6AnZGZX8asD
-/6BAOLDuAdcipCTzOehn4vx50NBOE9ZVd8TpJKR4vqlZNhe3SxYYFzzfxKsrzSfC
-Ka/DTXQaKcKDi7l4Mwd30hhpJvs6e7b6+wF8zCc0xielEHr7Mn7cAL8bhy66sWzC
-hKYHEaKq2MzrR0tc6nJhaOdrS3DmjPstnMxt24RDSdbPlffHfItkSDos8/VVblIx
-JjpqKT507sGzl6IcoPe8mI3RHLZ3pxSsS653x4IXBrpriby0Ty5QL0ByxqZhgs+F
-wzEfmQcI3Gs01N+Vnji3npxIdjLse9qQisF4VZXiDVJo2/JEHd7LDf2VarnauX5B
-rfIYy/nB3LJBSle+eXaAkAQUxssTOVyKbALRWCk7hCTUgB7oUl7LhTWurcrUB6fk
-dZtXjwVlbCCjRnn7ePJgFI2ReFrSK+cjjheUIJrXK9uUl0U3kF1NQ7LSQlJg2FMg
-N8tm+yssvA6s48cCT9Pw9RVTNJmeivjZ2jTN1G16Za9UNkw9Gis=
-=6/17
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.10.0.jar.sha1 b/error_prone/error_prone_test_helpers-2.10.0.jar.sha1
deleted file mode 100644
index 9fc415b..0000000
--- a/error_prone/error_prone_test_helpers-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bb6d4128a55d8a737c02cf00cdbc9d00758d23be
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.11.0.jar b/error_prone/error_prone_test_helpers-2.11.0.jar
new file mode 100644
index 0000000..696c86e
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.11.0.jar
diff --git a/error_prone/error_prone_test_helpers-2.11.0.jar.asc b/error_prone/error_prone_test_helpers-2.11.0.jar.asc
new file mode 100644
index 0000000..b19760c
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.11.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmHwSgYACgkQmiWcfuY2
+xe1QARAAmkZ/jK0uCOISac2IUNGIdaPmksrBtyJIoMBN1e5hobEDWxedMNUl5x90
+ngBQJhKNv1Q4kyuopLrVkMRxuUQzQZBTaf8hA8QpHbhQSXPWjhc46S+VSF6o9JJO
+7W3dCwxd/1meebsFOi1sqH2r5r1l8N13J6z62dGex32qv/HpX1KQwMN3S7+rCXAI
+wVh1RSR6ZfayfTUDTgJr13mgQnRyLdFLYHRH/gtvswhmscE1B10jUvpko+2DUpQz
+6blEqGm+ple/h9vuTincTkR610mM0jZNI2hKkKPezULyfdZwV9LRV2k3K7acwv+f
+Uqkxojq3zpYxeGVD9z8TefuFegBTV6mRG65aIKk2fWgPicK2RM98T4kz2AgFPHBv
+y38TWxaXN36hEJrTxkshkFTHTC5swuXBvzHKJFJvhG+8c/01sZkcdMZmk3V8U1Yt
+tDDXfcIuIk3gviuqf+9hBaY0B4Fy3PAfOo1P0J3co/CG6OtjQ8bPXn+uu0g68hFb
+fCz5WxmbY4/YqSXHa7q3FMI8JvnhAn6NF14bumpIj2bq7jN3LkejlTYvzH1rOKv4
+iiCgFOXc7/pggQiJp7ySFHFkEN4O7evQAF/+TF8xBlgeRaNT5OVTXeVcDXUQSRLj
+kSY2KLuDGw8pIvdxwiqv6DuGPezICJ9B5mFv8IUD+PmrZGh3TTA=
+=vZ5F
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.11.0.jar.sha1 b/error_prone/error_prone_test_helpers-2.11.0.jar.sha1
new file mode 100644
index 0000000..e20e2cb
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.11.0.jar.sha1
@@ -0,0 +1 @@
+a651fdd44623e35887b70313687bfecbc23dd623
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.10.0.jar b/error_prone/error_prone_type_annotations-2.10.0.jar
deleted file mode 100644
index 53bcba6..0000000
--- a/error_prone/error_prone_type_annotations-2.10.0.jar
+++ /dev/null
diff --git a/error_prone/error_prone_type_annotations-2.10.0.jar.asc b/error_prone/error_prone_type_annotations-2.10.0.jar.asc
deleted file mode 100644
index 8539174..0000000
--- a/error_prone/error_prone_type_annotations-2.10.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmGEWpMACgkQmiWcfuY2
-xe1xARAAs7uV4QEfo8isx0EqsfQgcLMv1xkNM4MVuQ2/mjiOMoU/EAPqLEDkAkRM
-0YGrU+TWydAQsPokzV07gr5g+fWEElBbfANmW+oPsjAkJkzHyufyXE1KrEaLmHQB
-jNXQqva70rZcP1fyCQIIr0sBBlqy6KQM6oz9KXalKjyBfSK9buR6u5BJRb31OZ7B
-hRj8JkM96hRuBopEaMicm3GyCfZ8IqsJQzoevPPPaqcTH2sWBOq6aGVnEDdjOSSB
-vLRLqsf9SFrekxMhqvi5W18FKPrT8tqQ3gbRyDbnfV413CK/9Qgegq+pV+Vjs0Vx
-N4Mg98PKZDa2YwOENKKmCP8DcZ8H0qxdZd9sGxG/pvNe32BlFEGPt3rTosJmz7bd
-eWZplKWERcipZWebY5ArNcroZ5+EJGg7kEG0j1PDnpNOL6Tl3SaPCSGxQbs1o6h4
-FWtgx/lUKgPgmf7Rm1wFfL7wSHwapzMetLr/i27bYpHdaBYmnfO+p5pe7DObjKpJ
-tBNubbHE+f6w007u3A5r07jzXayy1wA+0fZgjXqEXwLARuCb3gSIZ3yyE3RTYQY7
-qPT1AVdfjZI95vRn3WcOsfMa3neuFoTnjrs+6vMgusRYPWepX+oY9jUb9rrjVFe1
-2iBX26HmYFSCIAub115JN5EUY7iwJf3kDgyelBIB6MAEdQisxbc=
-=XCXI
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.10.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.10.0.jar.sha1
deleted file mode 100644
index 7298ad8..0000000
--- a/error_prone/error_prone_type_annotations-2.10.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-41396cadb7fe56349abb7c22df6983879a5a9f14
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.11.0.jar b/error_prone/error_prone_type_annotations-2.11.0.jar
new file mode 100644
index 0000000..cd58836
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.11.0.jar
diff --git a/error_prone/error_prone_type_annotations-2.11.0.jar.asc b/error_prone/error_prone_type_annotations-2.11.0.jar.asc
new file mode 100644
index 0000000..f4a401a
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.11.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmHwSgwACgkQmiWcfuY2
+xe2pUA//cCgg1sOriWDyHihZkvDAL3bRhQArBXauBWEqoh5dE1muNvgIfOuVFN1a
+PaXUUs0V1KzirnSw9JORgCvLm/IMH9YILQK9qTN/piRWQ61zwU0gCBCPYAllj4HJ
+aRbcWYNKj1QsKvJACOanETI5X++OEThajTYD1/L8ovICSotmesAa/1fqB60iYyDj
+xleN8336gqMbcAWoux4P0db3jBzahZPy8mYJqXM+csyTyO4pQGIRuLL8dRHcJGov
+PDBZZjgYe+nB6lfgZBC1YzbnCl9z9oQO5OG73/DI7/UHwQJ3wNLfBdPZMA2wfxfZ
+xcloamxYaTU09bp0buTRplI6sDZ+k5EvzrJpgHislNxDZ+ljhVFl9cVFKm1QBKzV
+WuWEZoL8pOrrjCSVdJzny0DWZDPnYnBKRYSbF9MZp9pBYmQnPDskSIFbGD24Z0VZ
+KQR7SUBqMqIcqWctl1YbQbQuW3eDGn/YqY2vI/Zad3DcscdnHfs2To5+zZjkdUpL
+VVUpjn8D8aJBoyd5Ta+TS5bPQP+GOul26oomUx8hFy9sFwUzfrI0zoxVITPKzCVO
+QAZwt+PK86wKjApMUCkHHxN+mJg+QVJ1rP7k3RaJl/UcS9yVduA2PrHBmBBLhQi3
+0QtW8ThaXM42We3s3Aun9jsLWU5ioq548V5N/X+6Hjql6z3podw=
+=2Wu9
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.11.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.11.0.jar.sha1
new file mode 100644
index 0000000..0e8fe5b
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.11.0.jar.sha1
@@ -0,0 +1 @@
+769ac47aa8ac186e7193731e03ce83140094f145
\ No newline at end of file
diff --git a/javac/METADATA b/javac/METADATA
index 3e8d3c2..a7afcd6 100644
--- a/javac/METADATA
+++ b/javac/METADATA
@@ -12,5 +12,5 @@ third_party {
     value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/javac/9+181-r4173-1/javac-9+181-r4173-1.jar"
   }
   version: "9+181-r4173-1"
-  last_upgrade_date { year: 2021 month: 11 day: 22}
+  last_upgrade_date { year: 2022 month: 2 day: 3}
 }
diff --git a/soong/error_prone.go b/soong/error_prone.go
index 627d877..79fab42 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -22,9 +22,9 @@ func init() {
 	// These values are set into build/soong/java/config/config.go so that soong doesn't have any
 	// references to external/error_prone, which may not always exist.
 	config.ErrorProneClasspath = []string{
-		"external/error_prone/error_prone/error_prone_core-2.10.0-with-dependencies.jar",
-		"external/error_prone/error_prone/error_prone_annotations-2.10.0.jar",
-		"external/error_prone/error_prone/error_prone_type_annotations-2.10.0.jar",
+		"external/error_prone/error_prone/error_prone_core-2.11.0-with-dependencies.jar",
+		"external/error_prone/error_prone/error_prone_annotations-2.11.0.jar",
+		"external/error_prone/error_prone/error_prone_type_annotations-2.11.0.jar",
 		"external/error_prone/checkerframework/dataflow-errorprone-3.15.0.jar",
 		"external/error_prone/jFormatString/jFormatString-3.0.0.jar",
 	}
@@ -127,6 +127,7 @@ func init() {
 		"-Xep:DurationFrom:WARN",
 		"-Xep:DurationTemporalUnit:WARN",
 		"-Xep:EqualsHashCode:WARN",
+		"-Xep:EqualsNull:WARN",
 		"-Xep:EqualsReference:WARN",
 		"-Xep:FormatString:WARN",
 		"-Xep:FromTemporalAccessor:WARN",
@@ -159,7 +160,6 @@ func init() {
 		"-Xep:ProtoFieldNullComparison:WARN",
 		"-Xep:RandomModInteger:WARN",
 		"-Xep:RectIntersectReturnValueIgnored:WARN",
-		"-Xep:RemovedInJDK11:WARN",
 		"-Xep:ReturnValueIgnored:WARN",
 		"-Xep:SelfAssignment:WARN",
 		"-Xep:SelfComparison:WARN",
@@ -170,236 +170,10 @@ func init() {
 		"-Xep:UnnecessaryCheckNotNull:WARN",
 		"-Xep:UnusedCollectionModifiedInPlace:WARN",
 		"-Xep:XorPower:WARN",
-
-		// Errorprone default severity WARNING
-		// "-Xep:AmbiguousMethodReference:WARN",
-		// "-Xep:ArgumentSelectionDefectChecker:WARN",
-		// "-Xep:ArrayAsKeyOfSetOrMap:WARN",
-		// "-Xep:AssertEqualsArgumentOrderChecker:WARN",
-		// "-Xep:AssertThrowsMultipleStatements:WARN",
-		// "-Xep:AssertionFailureIgnored:WARN",
-		// "-Xep:AutoValueFinalMethods:WARN",
-		// "-Xep:BadAnnotationImplementation:WARN",
-		// "-Xep:BadComparable:WARN",
-		// "-Xep:BadImport:WARN",
-		// "-Xep:BadInstanceof:WARN",
-		// "-Xep:BigDecimalEquals:WARN",
-		// "-Xep:BigDecimalLiteralDouble:WARN",
-		// "-Xep:BoxedPrimitiveConstructor:WARN",
-		// "-Xep:ByteBufferBackingArray:WARN",
-		// "-Xep:CannotMockFinalClass:WARN",
-		// "-Xep:CanonicalDuration:WARN",
-		// "-Xep:CatchAndPrintStackTrace:WARN",
-		// "-Xep:CatchFail:WARN",
-		// "-Xep:ClassCanBeStatic:WARN",
-		// "-Xep:ClassNewInstance:WARN",
-		// "-Xep:CloseableProvides:WARN",
-		// "-Xep:CollectionToArraySafeParameter:WARN",
-		// "-Xep:CollectorShouldNotUseState:WARN",
-		// "-Xep:ComparableAndComparator:WARN",
-		// "-Xep:DateFormatConstant:WARN",
-		// "-Xep:DefaultCharset:WARN",
-		// "-Xep:DeprecatedThreadMethods:WARN",
-		// "-Xep:DoubleBraceInitialization:WARN",
-		// "-Xep:DoubleCheckedLocking:WARN",
-		// "-Xep:EqualsGetClass:WARN",
-		// "-Xep:EqualsHashCode:WARN",
-		// "-Xep:EqualsIncompatibleType:WARN",
-		// "-Xep:EqualsUnsafeCast:WARN",
-		// "-Xep:EqualsUsingHashCode:WARN",
-		// "-Xep:ExtendingJUnitAssert:WARN",
-		// "-Xep:FallThrough:WARN",
-		// "-Xep:Finally:WARN",
-		// "-Xep:FloatCast:WARN",
-		// "-Xep:FloatingPointAssertionWithinEpsilon:WARN",
-		// "-Xep:FloatingPointLiteralPrecision:WARN",
-		// "-Xep:FragmentInjection:WARN",
-		// "-Xep:FragmentNotInstantiable:WARN",
-		// "-Xep:FutureReturnValueIgnored:WARN",
-		// "-Xep:GetClassOnEnum:WARN",
-		// "-Xep:HidingField:WARN",
-		// "-Xep:ImmutableAnnotationChecker:WARN",
-		// "-Xep:ImmutableEnumChecker:WARN",
-		// "-Xep:IncompatibleModifiers:WARN",
-		// "-Xep:InconsistentCapitalization:WARN",
-		// "-Xep:InconsistentHashCode:WARN",
-		// "-Xep:IncrementInForLoopAndHeader:WARN",
-		// "-Xep:InjectOnConstructorOfAbstractClass:WARN",
-		// "-Xep:InputStreamSlowMultibyteRead:WARN",
-		// "-Xep:InstanceOfAndCastMatchWrongType:WARN",
-		// "-Xep:IntLongMath:WARN",
-		// "-Xep:IterableAndIterator:WARN",
-		// "-Xep:JUnit3FloatingPointComparisonWithoutDelta:WARN",
-		// "-Xep:JUnit4ClassUsedInJUnit3:WARN",
-		// "-Xep:JUnitAmbiguousTestClass:WARN",
-		// "-Xep:JavaLangClash:WARN",
-		// "-Xep:JdkObsolete:WARN",
-		// "-Xep:LockNotBeforeTry:WARN",
-		// "-Xep:LogicalAssignment:WARN",
-		// "-Xep:MathAbsoluteRandom:WARN",
-		// "-Xep:MissingCasesInEnumSwitch:WARN",
-		// "-Xep:MissingFail:WARN",
-		// "-Xep:MissingOverride:WARN",
-		// "-Xep:ModifiedButNotUsed:WARN",
-		// "-Xep:ModifyCollectionInEnhancedForLoop:WARN",
-		// "-Xep:MultipleParallelOrSequentialCalls:WARN",
-		// "-Xep:MutableConstantField:WARN",
-		// "-Xep:NarrowingCompoundAssignment:WARN",
-		// "-Xep:NestedInstanceOfConditions:WARN",
-		// "-Xep:NonAtomicVolatileUpdate:WARN",
-		// "-Xep:NonOverridingEquals:WARN",
-		// "-Xep:NullableConstructor:WARN",
-		// "-Xep:NullablePrimitive:WARN",
-		// "-Xep:NullableVoid:WARN",
-		// "-Xep:ObjectToString:WARN",
-		// "-Xep:ObjectsHashCodePrimitive:WARN",
-		// "-Xep:OperatorPrecedence:WARN",
-		// "-Xep:OptionalNotPresent:WARN",
-		// "-Xep:OrphanedFormatString:WARN",
-		// "-Xep:OverrideThrowableToString:WARN",
-		// "-Xep:Overrides:WARN",
-		// "-Xep:OverridesGuiceInjectableMethod:WARN",
-		// "-Xep:ParameterName:WARN",
-		// "-Xep:PreconditionsInvalidPlaceholder:WARN",
-		// "-Xep:ProtoRedundantSet:WARN",
-		// "-Xep:QualifierOrScopeOnInjectMethod:WARN",
-		// "-Xep:ReachabilityFenceUsage:WARN",
-		// "-Xep:ReferenceEquality:WARN",
-		// "-Xep:RequiredModifiers:WARN",
-		// "-Xep:ShortCircuitBoolean:WARN",
-		// "-Xep:StaticGuardedByInstance:WARN",
-		// "-Xep:StreamResourceLeak:WARN",
-		// "-Xep:StringSplitter:WARN",
-		// "-Xep:SwigMemoryLeak:WARN",
-		// "-Xep:SynchronizeOnNonFinalField:WARN",
-		// "-Xep:ThreadJoinLoop:WARN",
-		// "-Xep:ThreadLocalUsage:WARN",
-		// "-Xep:ThreadPriorityCheck:WARN",
-		// "-Xep:ThreeLetterTimeZoneID:WARN",
-		// "-Xep:ToStringReturnsNull:WARN",
-		// "-Xep:TruthAssertExpected:WARN",
-		// "-Xep:TruthConstantAsserts:WARN",
-		// "-Xep:TruthIncompatibleType:WARN",
-		// "-Xep:TypeNameShadowing:WARN",
-		// "-Xep:TypeParameterShadowing:WARN",
-		// "-Xep:TypeParameterUnusedInFormals:WARN",
-		// "-Xep:URLEqualsHashCode:WARN",
-		// "-Xep:UndefinedEquals:WARN",
-		// "-Xep:UnnecessaryParentheses:WARN",
-		// "-Xep:UnsafeFinalization:WARN",
-		// "-Xep:UnsafeReflectiveConstructionCast:WARN",
-		// "-Xep:UnsynchronizedOverridesSynchronized:WARN",
-		// "-Xep:UseCorrectAssertInTests:WARN",
-		// "-Xep:VariableNameSameAsType:WARN",
-		// "-Xep:WaitNotInLoop:WARN",
-		// "-Xep:WakelockReleasedDangerously:WARN",
-
-		// Errorprone default severity SUGGESTION
 	}
 
-	// The checks that are default-disabled and listed for completeness
-	// and simple experiments.
+	// The checks that are default-disabled
 	config.ErrorProneChecksDefaultDisabled = []string{
-		// Errorprone default severity ERROR
-		// "-Xep:AndroidJdkLibsChecker:ERROR",
-		// "-Xep:AssistedInjectAndInjectOnSameConstructor:ERROR",
-		// "-Xep:AutoFactoryAtInject:ERROR",
-		// "-Xep:ClassName:ERROR",
-		// "-Xep:ComparisonContractViolated:ERROR",
-		// "-Xep:DepAnn:ERROR",
-		// "-Xep:DivZero:ERROR",
-		// "-Xep:EmptyIf:ERROR",
-		// "-Xep:FuzzyEqualsShouldNotBeUsedInEqualsMethod:ERROR",
-		// "-Xep:InjectInvalidTargetingOnScopingAnnotation:ERROR",
-		// "-Xep:InjectMoreThanOneQualifier:ERROR",
-		// "-Xep:InjectScopeAnnotationOnInterfaceOrAbstractClass:ERROR",
-		// "-Xep:InjectScopeOrQualifierAnnotationRetention:ERROR",
-		// "-Xep:InjectedConstructorAnnotations:ERROR",
-		// "-Xep:InsecureCryptoUsage:ERROR",
-		// "-Xep:IterablePathParameter:ERROR",
-		// "-Xep:JMockTestWithoutRunWithOrRuleAnnotation:ERROR",
-		// "-Xep:Java7ApiChecker:ERROR",
-		// "-Xep:JavaxInjectOnFinalField:ERROR",
-		// "-Xep:LockMethodChecker:ERROR",
-		// "-Xep:LongLiteralLowerCaseSuffix:ERROR",
-		// "-Xep:NoAllocation:ERROR",
-		// "-Xep:NumericEquality:ERROR",
-		// "-Xep:ParameterPackage:ERROR",
-		// "-Xep:RestrictTo:ERROR",
-		// "-Xep:StaticOrDefaultInterfaceMethod:ERROR",
-		// "-Xep:UnlockMethod:ERROR",
-
-		// Errorprone default severity WARNING
-		// "-Xep:AnnotateFormatMethod:WARN",
-		// "-Xep:AnnotationPosition:WARN",
-		// "-Xep:AssertFalse:WARN",
-		// "-Xep:AssistedInjectAndInjectOnConstructors:WARN",
-		// "-Xep:BinderIdentityRestoredDangerously:WARN",
-		// "-Xep:BindingToUnqualifiedCommonType:WARN",
-		// "-Xep:ConstructorInvokesOverridable:WARN",
-		// "-Xep:ConstructorLeaksThis:WARN",
-		// "-Xep:EmptyTopLevelDeclaration:WARN",
-		// "-Xep:EqualsBrokenForNull:WARN",
-		// "-Xep:ExpectedExceptionChecker:WARN",
-		// "-Xep:FunctionalInterfaceClash:WARN",
-		// "-Xep:HardCodedSdCardPath:WARN",
-		// "-Xep:InconsistentOverloads:WARN",
-		// "-Xep:InvalidParam:WARN",
-		// "-Xep:InvalidTag:WARN",
-		// "-Xep:InvalidThrows:WARN",
-		// "-Xep:MissingDefault:WARN",
-		// "-Xep:MutableMethodReturnType:WARN",
-		// "-Xep:NoFunctionalReturnType:WARN",
-		// "-Xep:NonCanonicalStaticMemberImport:WARN",
-		// "-Xep:NullableDereference:WARN",
-		// "-Xep:PrimitiveArrayPassedToVarargsMethod:WARN",
-		// "-Xep:ProtosAsKeyOfSetOrMap:WARN",
-		// "-Xep:ProvidesFix:WARN",
-		// "-Xep:QualifierWithTypeUse:WARN",
-		// "-Xep:RedundantThrows:WARN",
-		// "-Xep:ReturnFromVoid:WARN",
-		// "-Xep:StaticQualifiedUsingExpression:WARN",
-		// "-Xep:StringEquality:WARN",
-		// "-Xep:SystemExitOutsideMain:WARN",
-		// "-Xep:TestExceptionChecker:WARN",
-		// "-Xep:UnnecessaryDefaultInEnumSwitch:WARN",
-		// "-Xep:Unused:WARN",
-		// "-Xep:UnusedException:WARN",
-		// "-Xep:Var:WARN",
-
-		// Errorprone default severity SUGGESTION
-		// "-Xep:BooleanParameter:SUGGESTION",
-		// "-Xep:ClassNamedLikeTypeParameter:SUGGESTION",
-		// "-Xep:ConstantField:SUGGESTION",
-		// "-Xep:EmptySetMultibindingContributions:SUGGESTION",
-		// "-Xep:ExpectedExceptionRefactoring:SUGGESTION",
-		// "-Xep:FieldCanBeFinal:SUGGESTION",
-		// "-Xep:FieldMissingNullable:SUGGESTION",
-		// "-Xep:ImmutableRefactoring:SUGGESTION",
-		// "-Xep:LambdaFunctionalInterface:SUGGESTION",
-		// "-Xep:MethodCanBeStatic:SUGGESTION",
-		// "-Xep:MixedArrayDimensions:SUGGESTION",
-		// "-Xep:MultiVariableDeclaration:SUGGESTION",
-		// "-Xep:MultipleTopLevelClasses:SUGGESTION",
-		// "-Xep:MultipleUnaryOperatorsInMethodCall:SUGGESTION",
-		// "-Xep:PackageLocation:SUGGESTION",
-		// "-Xep:ParameterComment:SUGGESTION",
-		// "-Xep:ParameterNotNullable:SUGGESTION",
-		// "-Xep:PrivateConstructorForNoninstantiableModule:SUGGESTION",
-		// "-Xep:PrivateConstructorForUtilityClass:SUGGESTION",
-		// "-Xep:RemoveUnusedImports:SUGGESTION",
-		// "-Xep:ReturnMissingNullable:SUGGESTION",
-		// "-Xep:ScopeOnModule:SUGGESTION",
-		// "-Xep:SwitchDefault:SUGGESTION",
-		// "-Xep:TestExceptionRefactoring:SUGGESTION",
-		// "-Xep:ThrowsUncheckedException:SUGGESTION",
-		// "-Xep:TryFailRefactoring:SUGGESTION",
-		// "-Xep:TypeParameterNaming:SUGGESTION",
-		// "-Xep:UngroupedOverloads:SUGGESTION",
-		// "-Xep:UnnecessarySetDefault:SUGGESTION",
-		// "-Xep:UnnecessaryStaticImport:SUGGESTION",
-		// "-Xep:UseBinds:SUGGESTION",
-		// "-Xep:WildcardImport:SUGGESTION",
 	}
 
 	config.ErrorProneChecksOff = []string{