Snap for 11130229 from 45931abbc448bfa6efc826528f3eff5d092e32dd to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I1fe548d79fc249303ced096fa0513703401f3e7d

41 files changed, 118 insertions, 109 deletions

diff --git a/Android.bp b/Android.bp
index 0071f2a..492d574 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.15.0.jar"],
+    jars: ["error_prone/error_prone_annotations-2.23.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.15.0-with-dependencies.jar",
-        "error_prone/error_prone_annotations-2.15.0.jar",
+        "error_prone/error_prone_core-2.23.0-with-dependencies.jar",
+        "error_prone/error_prone_annotations-2.23.0.jar",
     ],
 }
 
@@ -71,7 +71,7 @@ java_import {
     host_supported: true,
     visibility: ["//visibility:public"],
     jars: [
-        "error_prone/error_prone_test_helpers-2.15.0.jar",
+        "error_prone/error_prone_test_helpers-2.23.0.jar",
         "jimfs/jimfs-1.1.jar",
     ],
 }
diff --git a/checkerframework/Android.bp b/checkerframework/Android.bp
index bd43afd..864f99d 100644
--- a/checkerframework/Android.bp
+++ b/checkerframework/Android.bp
@@ -30,7 +30,7 @@ license {
 java_import {
     name: "error_prone_checkerframework_dataflow_errorprone",
     host_supported: true,
-    jars: ["dataflow-errorprone-3.21.2.jar"],
+    jars: ["dataflow-errorprone-3.39.0.jar"],
 }
 
 // This is effectively dataflow-nullaway library
diff --git a/checkerframework/METADATA b/checkerframework/METADATA
index e9f340a..d586bc5 100644
--- a/checkerframework/METADATA
+++ b/checkerframework/METADATA
@@ -11,12 +11,12 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/3.21.2/dataflow-errorprone-3.21.2-sources.jar"
+    value: "https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/3.39.0/dataflow-errorprone-3.39.0-sources.jar"
   }
   url {
     type: ARCHIVE
     value: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.15.0/javacutil-3.15.0-sources.jar"
   }
-  version: "3.21.2"
-  last_upgrade_date { year: 2022 month: 2 day: 14}
+  version: "3.39.0"
+  last_upgrade_date { year: 2023 month: 11 day: 14}
 }
diff --git a/checkerframework/dataflow-errorprone-3.21.2-sources.jar b/checkerframework/dataflow-errorprone-3.21.2-sources.jar
deleted file mode 100644
index 3581c00..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2-sources.jar
+++ /dev/null
diff --git a/checkerframework/dataflow-errorprone-3.21.2-sources.jar.asc b/checkerframework/dataflow-errorprone-3.21.2-sources.jar.asc
deleted file mode 100644
index 4bb9a6a..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2-sources.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.68
-
-iQEcBAABAgAGBQJh+YPpAAoJELFmmKSt9NY4aKkIAI3J8GVAkmGh43brn0pkBBMY
-VKWnjJbnG6EIiEQ2MjM+k6ZhRjhAUf+fYdcV04QCj8mu0+BQFKwzgj2eGzlJ+gxM
-H7cucnKqIX+pQstr1AINRXFMh/WCMEU24ftM3CFYgiJf0p944oGJtcuT1ve4aJWg
-aZpu+pWu6wIyL7/7ET9DZ4DMfFniK0a2AVsVEcJmA3czx0FRJL8UcQvuxCYTdtRJ
-3PK6/dZRGb+cqyZPG8p/gDpxF215zWg1aw1UpmAKNWWhoioX7JGC2CVR1tlmS389
-iA2q80BuAMibd4mTnflHF9R57cO2vCjYs4BmAiiqTesmwKj0vPmVxAcAr1mMk10=
-=xH0H
------END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-errorprone-3.21.2-sources.jar.sha1 b/checkerframework/dataflow-errorprone-3.21.2-sources.jar.sha1
deleted file mode 100644
index e02b395..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1e699b6978054bab6e978868fa76686977622637
\ No newline at end of file
diff --git a/checkerframework/dataflow-errorprone-3.21.2.jar b/checkerframework/dataflow-errorprone-3.21.2.jar
deleted file mode 100644
index b780b3e..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2.jar
+++ /dev/null
diff --git a/checkerframework/dataflow-errorprone-3.21.2.jar.asc b/checkerframework/dataflow-errorprone-3.21.2.jar.asc
deleted file mode 100644
index fc93247..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.68
-
-iQEcBAABAgAGBQJh+YPpAAoJELFmmKSt9NY4/Z4H/252NY7ats4kOuzp1m0Ji+Fi
-e4bZq48yfCbhbKqKtl5y3aFowrTmLzaY2/YGotZ3eMTnZtG59pVjhrqV04XhG4mM
-Mjh9P56uSOSBherl648TrIYc7Clz2os3OCDjoaoEfzy5VCuA0OVKq2URjKDjrM3B
-Om5rIdFGdi6Er5RL7svXtjEcvVMvg0TEMBZAhmKikR4wkG/g1FTO6zs0xermINo7
-Vswvi639D/HLfhpTs9lWfaUZk6cb+WNmkwx7+F3r8AbtyBby51/hSk6GIDAyic7q
-CLVUXg9xR2pFRGza2s/kdZl9EOAEMEQFNGO2V44hWc/XX5pY3pkdeqHlSV+nv7s=
-=mA14
------END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-errorprone-3.21.2.jar.sha1 b/checkerframework/dataflow-errorprone-3.21.2.jar.sha1
deleted file mode 100644
index 16db4fd..0000000
--- a/checkerframework/dataflow-errorprone-3.21.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0596b27bcfcdfb2e68ea53c55abb6b2be9991b7c
\ No newline at end of file
diff --git a/checkerframework/dataflow-errorprone-3.39.0-sources.jar b/checkerframework/dataflow-errorprone-3.39.0-sources.jar
new file mode 100644
index 0000000..c3c574f
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.39.0-sources.jar
diff --git a/checkerframework/dataflow-errorprone-3.39.0-sources.jar.asc b/checkerframework/dataflow-errorprone-3.39.0-sources.jar.asc
new file mode 100644
index 0000000..6e83a9d
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.39.0-sources.jar.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.68
+
+iQFbBAABCABFFiEEGb6rLXmcAg8XxpEmsWaYpK301jgFAmUa7nknHGNoZWNrZXIt
+ZnJhbWV3b3JrLWRldkBnb29nbGVncm91cHMuY29tAAoJELFmmKSt9NY4WUgIALof
+0/2mPZynfhs1PwVyZmvpL1dpA9zEDfqDqCALTqkcayHBCSakaHrJZF2iWRqI9Og/
+brd8r45ThZcVEmemxCPrA4BSOMi6NzMR+7LzYlBnBjsjHxh2Ioinc6C8xj7q6rHa
+UOwYj50BkW4lVid5oBVQ37u+PXphNm2k/JlU0XHeXgjvtwC1aHpXIOXiHvKhjiex
+uSUlZcOHNuOlGHS0yCta+mBM0XorYzk9x0XEnLVKr7v2aCzNxODhWtoNjcXk6acI
+8LytIVUDGv2JQzIaM2R9le1ELEpnkiYNempot1qKarfwKBbnIkjHgjkbG2TtTmC/
+B0GyCFvz36KyjX93Xn4=
+=lLy+
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-errorprone-3.39.0-sources.jar.sha1 b/checkerframework/dataflow-errorprone-3.39.0-sources.jar.sha1
new file mode 100644
index 0000000..3c90ad3
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.39.0-sources.jar.sha1
@@ -0,0 +1 @@
+536e19b75a9f48b943d880a435f1bfcea18435bb
\ No newline at end of file
diff --git a/checkerframework/dataflow-errorprone-3.39.0.jar b/checkerframework/dataflow-errorprone-3.39.0.jar
new file mode 100644
index 0000000..f9dc2b8
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.39.0.jar
diff --git a/checkerframework/dataflow-errorprone-3.39.0.jar.asc b/checkerframework/dataflow-errorprone-3.39.0.jar.asc
new file mode 100644
index 0000000..4f0c0ae
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.39.0.jar.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.68
+
+iQFbBAABCABFFiEEGb6rLXmcAg8XxpEmsWaYpK301jgFAmUa7ngnHGNoZWNrZXIt
+ZnJhbWV3b3JrLWRldkBnb29nbGVncm91cHMuY29tAAoJELFmmKSt9NY4Gc0IAJhW
+Tnkj15hLghtB8Z0CZ/7yUUBu/yUI5EwRqd+QFYCIAHqkx1JRlju3NidrPGA8X7yJ
+pqO00RmFPM5VbvmjzMtXBFhPokoVpop8MiqNyVBpcgbXiyJvJ3IkUjRdfSqpTd/W
+VPMXrgMOG/u+hqbi95ZiHxyytnf7qFkC9sqlGLTU2TE+iBw7WEIaiNY1549W61hm
+ds9XINElDXao2LSD0s4ig7dvcGeDzKs9SXKV2COIrm66TE2EXgyC33tqN3cbekr1
+kJmUA0LxpmgBscn/Et1EgoiT+ik0oaeIxm+SqxNEkxTgb3ZfrYQJGJhRizLLuoWw
+29Tb7Gj+ELjYLyeA+bE=
+=oP7J
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-errorprone-3.39.0.jar.sha1 b/checkerframework/dataflow-errorprone-3.39.0.jar.sha1
new file mode 100644
index 0000000..febabda
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.39.0.jar.sha1
@@ -0,0 +1 @@
+bebfd6adaad87fe3f1880f63fef8acebdf5f777d
\ No newline at end of file
diff --git a/error_prone/METADATA b/error_prone/METADATA
index 867c1e6..74a2a3f 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.15.0/error_prone_core-2.15.0-with-dependencies.jar"
+    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.23.0/error_prone_core-2.23.0-with-dependencies.jar"
   }
-  version: "2.15.0"
-  last_upgrade_date { year: 2022 month: 9 day: 14}
+  version: "2.23.0"
+  last_upgrade_date { year: 2023 month: 11 day: 14}
 }
diff --git a/error_prone/error_prone_annotations-2.15.0.jar b/error_prone/error_prone_annotations-2.15.0.jar
deleted file mode 100644
index ff3b59a..0000000
--- a/error_prone/error_prone_annotations-2.15.0.jar
+++ /dev/null
diff --git a/error_prone/error_prone_annotations-2.15.0.jar.asc b/error_prone/error_prone_annotations-2.15.0.jar.asc
deleted file mode 100644
index 04269f3..0000000
--- a/error_prone/error_prone_annotations-2.15.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmLq9eQACgkQ02Srqjmk
-cyDakBAAiVzmhebUAHHhRiBclz/AWdJHvQ0CEdnSR0ND43LJHKaIGLfm0abl7qcs
-bVbj+I3Ev+JOoW7tVV2nnWJr0dVQDuNpPs/OxDuTGj5SjIBBuBE2ShP0Pj/lAL8i
-sw2JAV1LFevam+yMYuNrbXudoiRupL/GfcbaK5q2zqtx2keM6z2YzoT2fygVqGPR
-E6I3sGSnL8GFVYYkHR1SSxy5OgOddWW+ND53iaelcDBK9MsZMy3uUT4HAI0ae6rT
-hh0Y2hRrD0r5p+DEQ5UcxzskMy2pVmkdlKItKCpd2q7YBMRm2l/1mFs6WPyDSV8i
-xfDbr27Vylt/OwwAK8w/6LYZL6fDOuXme2BPJT5lppBcNEZvAJKaE7aHrprN4azx
-SF3IqUpz0y7R1ORbiinlClyIFd8EJ2hBhkTNao+sCxhcBsBd4h2vXIr6KZ93gw9D
-I1n632+j0GWPQVMsaYVkVmsHjHPl4ID2zujpU8aWn1/OfyYCjuZue9API9CbwkVV
-fWsMAH8sqYMSsttFy6XfxBoxsbIr8I3h5DiHU+ABkX3AR08MVvzIT7zWXuquvYRr
-HXKWxYQ0W1t4b+Yyc513jyt5Bz0L9I/sraxcWHEPtfiVa34ovZ+WErMaAZwd0R9B
-rxV3d0lrx7x5YUUnvCKbrs+G3HDNknQLsWL6d7dpKKr+FuySreI=
-=mu9Y
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.15.0.jar.sha1 b/error_prone/error_prone_annotations-2.15.0.jar.sha1
deleted file mode 100644
index 49d1962..0000000
--- a/error_prone/error_prone_annotations-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-38c8485a652f808c8c149150da4e5c2b0bd17f9a
\ No newline at end of file
diff --git a/error_prone/error_prone_annotations-2.23.0.jar b/error_prone/error_prone_annotations-2.23.0.jar
new file mode 100644
index 0000000..c0f20d8
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.23.0.jar
diff --git a/error_prone/error_prone_annotations-2.23.0.jar.asc b/error_prone/error_prone_annotations-2.23.0.jar.asc
new file mode 100644
index 0000000..3a64720
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.23.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmUwJK8ACgkQ02Srqjmk
+cyC1tA//QclSI6+ttVc/U74YXcMkVSahcgn7ZCuZD3huZilP9PJ3r/UL7y8IkvO6
+5Rdh590Xkalz9yFLjmCrxC/JxMp6AKafN13sMSoHyB1mNqFL3F/Y5xwV1Pv7lwtF
+5cyW9V1dMDDIj3FaOlvmb8FgeuvbgBbokgv1XWioRNBvqGFmvcGDJReM3swHl1bG
+4o3Ar6pgEjBU93pJGzdMMxWrkH7bxpmjLlMXdhD7wj/FwSqKdxN73jrwxEKVCS9m
+ecNjYx7D1AyiJFkbD2eX40pYq+lXsR78ic1gXC+vC+0jREgKIhEMeZiZrovhm/lk
+kOQFiFAEmstDqhMEQLxLIKPVCEwh04dzXd2HD8tV1+xmJsaWXmaVtZUVlcv4IJ6Z
+rW1/5g354ewoEW9zdTBpr3Ny9gFpS7BNg0tSvIkkT2o5aHPJildWbzG8gxZN91Z0
+RyowWH03e68QuXaQj0CRc0LLo4X2aBoWjgAlczaV5JYFQUxphEi6ZnjszM0O/o/I
+j3/ORpWI9irOyzPRaRFVoCpQYFeL0my+9dMTcptw1CTFPEQWqgmUcpfDyA6tXlfB
+Kd28XK80x1rDeO3d8gyBE0GjX5u3xX/pkdDId16q9kSSIT39B7r0njdXQ3WbjRwa
+VI+pGQbvaBDkRQ+AGLoGJW8QCkFBHHoc9ySnt9lPVSpIavcQXSI=
+=mDEN
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.23.0.jar.sha1 b/error_prone/error_prone_annotations-2.23.0.jar.sha1
new file mode 100644
index 0000000..9fb2bd9
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.23.0.jar.sha1
@@ -0,0 +1 @@
+43a27853b6c7d54893e0b1997c2c778c347179eb
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.15.0-with-dependencies.jar.asc b/error_prone/error_prone_core-2.15.0-with-dependencies.jar.asc
deleted file mode 100644
index 00e81af..0000000
--- a/error_prone/error_prone_core-2.15.0-with-dependencies.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmLq9vcACgkQ02Srqjmk
-cyB+og/+I7M6TyJiD/KQh1nfXMECKx8AEAiBKsFnYKZYtoCoSshKEpvhLp/b1P4U
-CczSizdWp0jGnTnQXyZSbAGHlKO5AvWmwYrA4fQLTHIlI58T4EPvf2+X0bx4ZQew
-93UN20ucTFb0LzGapUrPUpXiQDA04cZsUXmETSlfk/Bpnl4GBFvYabP1UPQQsUVl
-y3duOjnDjx6fmd0Bh6U7SsxJXz0u0BrsF/qps+xkeJW1akRaSAKLmkaQmltHPHsh
-1NzwJnfSCrfyVxYr2capRJM/OfaNEaZ5dtv2g4yCYVtcuQeEYE8OyJkOAiZsDvt+
-4CVXhCbXCRkYx89bidTwWSPu1ZyRoh5ZPl0+pOcjuUa7RwI3m0HX8IK+0qSwR/K6
-KKjruXbSiWh/o31Re1P3W4ReZzjipoxxGOgjPL8Q/q3+5WIi5z+GMCApN8X4l2PZ
-w/b94LZfBUpzQR1Mnnp7uLUSBIXWpdi81jmnCqrb3CRuAAhA33/cErVlv+hMVI5Q
-baCkSmizhm19eApPSrxBQkL4dIa4J8r60gEne+M9USYSQmvJ0LINA0RNYzPelNTs
-rSn5EcjFJOJHWWzH0ti0xrMzUaELP2is1IyXFACe9jeCDH6i2MvqpDjc/eyUeRCz
-I73iwfhsEkMgDZZVX0nEKZJ5aezeyBwnHuti2psdLUv2NisR7Ak=
-=Dqox
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.15.0-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.15.0-with-dependencies.jar.sha1
deleted file mode 100644
index 6249984..0000000
--- a/error_prone/error_prone_core-2.15.0-with-dependencies.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3c7c752dfcd2c9627402ea7649a52afa7eae71c6
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.15.0-with-dependencies.jar b/error_prone/error_prone_core-2.23.0-with-dependencies.jar
index 158ed2b..8f58a20 100644
--- a/error_prone/error_prone_core-2.15.0-with-dependencies.jar
+++ b/error_prone/error_prone_core-2.23.0-with-dependencies.jar
diff --git a/error_prone/error_prone_core-2.23.0-with-dependencies.jar.asc b/error_prone/error_prone_core-2.23.0-with-dependencies.jar.asc
new file mode 100644
index 0000000..9df46fa
--- /dev/null
+++ b/error_prone/error_prone_core-2.23.0-with-dependencies.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmUwJaAACgkQ02Srqjmk
+cyAx5BAAjZnMJPi2uuuGWytjaN2+N796fIeRlqoNbSSN27BLWZKveE6zVnOPvq2p
+eBSdDhWzg5brPLGiw0GVAnlUWhyxiCr77s6gnPgDklWni64QrbYMuIhuJxmEWMd9
+6nHGAcEVfZSDZJZy1IbB96IQllaRsx2iZGltzjzs4lxrH6v6KRMOc13FnJzuj52X
+tEg+CtM6C2/bILTOt7wrDHjtJEi4RXMUudUyfuarh3U9CsXAYIsgVe9LHg00BPxI
+4f7CID/kGkELzudaC5LIOwkWQ9HnVl1yylmey+iir1DqNqXwkuduR3/h//+ctKB3
+nArPUk4WjtgMtVbGxugOgFVQVdPyBQSRfct0N7F0ebU+77HyZkHAOfrhh1MoYWea
+Px55XfwDldWTLtvZmHKAhZxUkX0R/9a1GAZqGHJ/2bmc4hNGHChfLcT9utpgpg5B
+5koELb9ZMc+dJgry9rDCAaPQx6Fn1ozLvTe5kC6/YZPk1NlPMdcdY9gwx/x0P2To
+nal4muOrjSjEq91sNPpRsHZ06IPxqumwKvQ4+g/bpOYrI2uFTEE1bWjRCDBVqST0
+iYWf00nR6lzXBT0732inMEurngthrPVP6I4FcliYjVLRYO/sSrLxyQXbCl0ESQqP
+E5+1iGtVYzerSgqe2dUmLRiMT+nrmFs6nlSARWVepZRwyUEgFjc=
+=zC99
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.23.0-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.23.0-with-dependencies.jar.sha1
new file mode 100644
index 0000000..5467ebc
--- /dev/null
+++ b/error_prone/error_prone_core-2.23.0-with-dependencies.jar.sha1
@@ -0,0 +1 @@
+ee64ac4f22941d5d8e4472bf0188b5e59eb9588d
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.15.0.jar b/error_prone/error_prone_test_helpers-2.15.0.jar
deleted file mode 100644
index babf271..0000000
--- a/error_prone/error_prone_test_helpers-2.15.0.jar
+++ /dev/null
diff --git a/error_prone/error_prone_test_helpers-2.15.0.jar.asc b/error_prone/error_prone_test_helpers-2.15.0.jar.asc
deleted file mode 100644
index 881ca88..0000000
--- a/error_prone/error_prone_test_helpers-2.15.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmLq9f0ACgkQ02Srqjmk
-cyBm2BAAiU1i+nkBU7iX15I4a6hBYlVDUAbRuQxKA46mX4Fpk1faXcMAauPdyHRo
-k5XVqpCd4P2Y9TLyBGYKIjJ+dNtD6TGgu251c4f6tDAwcxOpYxM+yriQWLRBSzz0
-LQkUSqVorQHhIvWHW1nza5siypzE5h403N9OKtxlvr/ThEimb5Yi7UbtPHuepBHQ
-6/Gyyn7qdiHrqgfVS7B0TtfM07KJRMSNkB4D6BTBtEXpxgb0pBqP7KlFMvkfoSWp
-JE9wxx3fY0PqAEwD56gpKn/OWmuG2WovOeWT+ZgNswhFuBnf16Xz8U/QGZrYiP/v
-TQ6nxhqEHOV5vmxg0pd8uKN+gWvEaX0w8CivM/PKOjpIpgoNRIV3D/z5v+GEGosL
-Gz95evjVt86OpfCO8z+XBPJqcdnYajNPgg+JuTI3sg/hErB9kReLDXSQ1531Dvve
-JGugu/+aOIbXQhxyQnUr7xQXTnGPR1uUb9t7UE2s7GebeBle+saRrxRcSMHHNZp2
-Tvkq8xG1OLA8coQwu4DNEu5YH/0MbTkeXWZ7w5yP8t/kCvNq4Roct6rSbD8sUOKd
-Azw+Htq0e7G1aiz2mbi4Je5J3VgGF0UWDvMRCdxXWLMRN7uwFz374v4rqGzTv3p8
-grHGj7/2iAXJ+LhMD9KL6Awjz2eEHkAVnQ1GNdX2zjRSCv+HBwM=
-=f1TI
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.15.0.jar.sha1 b/error_prone/error_prone_test_helpers-2.15.0.jar.sha1
deleted file mode 100644
index 4461582..0000000
--- a/error_prone/error_prone_test_helpers-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-05af7e8657d4e14acbe774cd848fde9370d0cfff
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.23.0.jar b/error_prone/error_prone_test_helpers-2.23.0.jar
new file mode 100644
index 0000000..3e2c6bc
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.23.0.jar
diff --git a/error_prone/error_prone_test_helpers-2.23.0.jar.asc b/error_prone/error_prone_test_helpers-2.23.0.jar.asc
new file mode 100644
index 0000000..4512558
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.23.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmUwJMcACgkQ02Srqjmk
+cyAXQw//deP2qrMyhOAL3Ce809LMQofPl0PlGibaypQ7cRSDFj/nHspYxTOVzFmL
+YGS7sEX/c/o/W7v+Zwm+870tNSFgRyrTQCvavFwKNXD+318UbzjD3z00GIyfU8bI
+FLIBkEK763opZv/Nau6Dc3QGrILgAYPyZVjmoBnd8mSTJHzuqrSKkfhVdu4CqVMk
+b15NY+Ee7n1ZDozPGQu/YHapgd8GSCPyzUF8oKpIIReBfuRhdmUgGPqVDIk8cPjz
+PuJBvcW0EqoBzaRwtvFBk210JqzAlVXH4cxhtycKqUcpn5JtRPOj4urYGxfJ9gww
+Y1CXtrGYyufN93TKKfHpk8n35EWC/wJrs67+MH1B2VLptzES4RuND3roXRXPW03y
+W2ZWiwAfZUMNuJNRWGeJ/rALtHsCws7mbdOC1D7q40KvxrVF9kKXPKMqr0V97kDt
++OiWPmf9i3wzKwq1Uo58j4EMQvSo8wAcQfq9Glg2pzDtQsv5SLrBT6U947zjip5S
+plXY4cavlxAvvdS5n8IwsVqJuY/ji7IAhIMie6Zl5aEiKgY9u4z0LhL0TTlrN7B2
+gZ1LR9ybdBWv354hBhTvFz1BELBzLCvdB91pLqBW2oRDutskUOYjhhBpZwZCJElL
+sxXQ4/sxfgMHt/tH4i8Pw2UcGbjZ26DMj1787+XTFgXWYQZvyxA=
+=DvEC
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.23.0.jar.sha1 b/error_prone/error_prone_test_helpers-2.23.0.jar.sha1
new file mode 100644
index 0000000..30cc34f
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.23.0.jar.sha1
@@ -0,0 +1 @@
+961647e808489dc61e6f46e1e2f07a80c161de27
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.15.0.jar b/error_prone/error_prone_type_annotations-2.15.0.jar
deleted file mode 100644
index 9756f39..0000000
--- a/error_prone/error_prone_type_annotations-2.15.0.jar
+++ /dev/null
diff --git a/error_prone/error_prone_type_annotations-2.15.0.jar.asc b/error_prone/error_prone_type_annotations-2.15.0.jar.asc
deleted file mode 100644
index fd71c2a..0000000
--- a/error_prone/error_prone_type_annotations-2.15.0.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmLq9gEACgkQ02Srqjmk
-cyCkEw/+MhVrcMlaC5/mcwVcPPiYvH01JaQp02ycTlKnZ9GxxijZcfn6n6mSwTgD
-gQ3alYCxwy07jSFSFVfnGbjPT1CpWZyBHjSxXQLx6mzlx11nt5APrupmog/ZZd6c
-xAQrSwpTxp1E6sHG0Jrd+K5Kz9MvbFjoW82oqgBj9mGNXzAZcCexJq7mWKToPpPm
-Fx1dyCO+gulI/ec/ce0Scua++a4sdEsqn5UZk5x1xPpn4+JLExm4L8tvX4GvVZt0
-e2gZTxy0SDkCNxG2/NLMbNxunRmjJAbA7qS2e1MHcQTR9p0sOT2ntqoTQGJo1xDM
-dUwNCrFeCkVoFZijRh4HeJmdFfC9UFw2ZpJ5W6RFs9Hoxvj3uPZK+l3bbN3ZTi97
-0Av4y4z1ZT38E4GmXuV6txyRkAuk0jeEek8n4hP4XTOxgLPqrieEAQ+m+WGrZ9ys
-WByzhmma/yhPFGVe/WCNsZ40fYiTBRG+MVH0zuD9XoOeuP8Dp53HOYD0mogSLIpi
-r8zmIVegtZWHmtY2EyEYPk1qNouD750qc/F+96ARWzVndmDeau8efnTLapsTcHOc
-TYGPsf6U2Tmp1T3L5xoqa5Xf651vTN1E/OwsmDjuDgs3X+jJd/EbkENRDfe40EW6
-tt1Qx93RjS45SrGmSHL5PfqOM1VRV7GmuDyPbN6xZN0nJPAc4IE=
-=giF0
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.15.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.15.0.jar.sha1
deleted file mode 100644
index 14b5041..0000000
--- a/error_prone/error_prone_type_annotations-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8c0536c8e5cb3b83dd4a75c32406fdbde2345e24
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.23.0.jar b/error_prone/error_prone_type_annotations-2.23.0.jar
new file mode 100644
index 0000000..57092fa
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.23.0.jar
diff --git a/error_prone/error_prone_type_annotations-2.23.0.jar.asc b/error_prone/error_prone_type_annotations-2.23.0.jar.asc
new file mode 100644
index 0000000..7da967e
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.23.0.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7gyocwdAkvgG9Ztl02SrqjmkcyAFAmUwJMoACgkQ02Srqjmk
+cyAlPQ/8CJ55k4b0Y/oCWKcdj8OjRoTKK1OU6z+ef9jQ5WyVM33Q0wAz3USKkl6X
+/NoOnEUwahJ/rK5ZK9CDJCJCB3R8R6NEITBWOhEs8sw8/S2hrazMFLNnSj2B+Vnt
+tAgOPQq/6GgTjWf6jqhXeohFmniTNiEgsb7MXbCeoGqMriq++T50dlQZzhjwpOOy
+a0lhp4vYUpriobVHtAXXnpOCknUgkiqnKO8unqzbUZuJW1NROC8WjhZ2UoqnrqTz
+JJp5I9RG9cG9jb9bnWAvRo9PDF8t8+kkp4zMWGj6uX2puWIR5fmFMREHuhzRjsGF
+/Fo/LYdkTev2I2GVwmubZYTN/U3a+oMyLdnykpsOTXz4dmthn7P7V/M/GWt8YRkb
+IZM8hwmC5kajurFSOgmy/WKt5C7wJ1xqWd+fLwcWsZrTWzfx2EElb/+LxKE+Ex5J
+1eNyhkIkc0l/WIfWJPI0R2CsH9bFC2wJBF7TdTxI4dwrYUP2I1pnFVPC/qxUnlkY
+m8b7Jr2CdnBIGH099E+taiQpzYtEf7z1gSbc+H+hmha83zKacVFD/vY5OHldEeom
+hwAKaiCetVJfvoNeIJ0Em5QZnrwRjQ7ykqv09ExpVMOJuVf4ZreR7uWE75p8Y7uO
+pcv10QXwrf0+MqjUX/8yZhcgwUuKL0BMWeEtpQATBDd6ahss2q8=
+=Pe3J
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.23.0.jar.sha1 b/error_prone/error_prone_type_annotations-2.23.0.jar.sha1
new file mode 100644
index 0000000..cf927e5
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.23.0.jar.sha1
@@ -0,0 +1 @@
+6d4e88342dfb4c1a2c90cc1735abd6e3e96d0a44
\ No newline at end of file
diff --git a/javac/METADATA b/javac/METADATA
index 9a57142..dae8662 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: 2022 month: 9 day: 14}
+  last_upgrade_date { year: 2023 month: 11 day: 14}
 }
diff --git a/soong/error_prone.go b/soong/error_prone.go
index 24179ba..66bc6f2 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -22,10 +22,10 @@ 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.15.0-with-dependencies.jar",
-		"external/error_prone/error_prone/error_prone_annotations-2.15.0.jar",
-		"external/error_prone/error_prone/error_prone_type_annotations-2.15.0.jar",
-		"external/error_prone/checkerframework/dataflow-errorprone-3.21.2.jar",
+		"external/error_prone/error_prone/error_prone_core-2.23.0-with-dependencies.jar",
+		"external/error_prone/error_prone/error_prone_annotations-2.23.0.jar",
+		"external/error_prone/error_prone/error_prone_type_annotations-2.23.0.jar",
+		"external/error_prone/checkerframework/dataflow-errorprone-3.39.0.jar",
 		"external/error_prone/jFormatString/jFormatString-3.0.0.jar",
 	}
 
@@ -93,7 +93,7 @@ func init() {
 		"-Xep:ProtoStringFieldReferenceEquality:ERROR",
 		"-Xep:ProvidesMethodOutsideOfModule:ERROR",
 		"-Xep:RandomCast:ERROR",
-		"-Xep:RestrictedApiChecker:ERROR",
+		"-Xep:RestrictedApi:ERROR",
 		"-Xep:SelfAssignment:ERROR",
 		"-Xep:ShouldHaveEvenArgs:ERROR",
 		"-Xep:StreamToString:ERROR",
@@ -116,8 +116,10 @@ func init() {
 		"-Xep:BadAnnotationImplementation:WARN",
 		"-Xep:BadShiftAmount:WARN",
 		"-Xep:BanJNDI:WARN",
+		"-Xep:BareDotMetacharacter:WARN",
 		"-Xep:BoxedPrimitiveEquality:WARN",
 		"-Xep:ComparableType:WARN",
+		"-Xep:ComparisonOutOfRange:WARN",
 		"-Xep:ComplexBooleanConstant:WARN",
 		"-Xep:CollectionToArraySafeParameter:WARN",
 		"-Xep:ConditionalExpressionNumericPromotion:WARN",
@@ -138,12 +140,15 @@ func init() {
 		"-Xep:IdentityBinaryExpression:WARN",
 		"-Xep:IdentityHashMapBoxing:WARN",
 		"-Xep:IgnoredPureGetter:WARN",
+		"-Xep:ImmutableAnnotationChecker:WARN",
+		"-Xep:ImmutableEnumChecker:WARN",
 		"-Xep:InstantTemporalUnit:WARN",
 		"-Xep:InvalidTimeZoneID:WARN",
 		"-Xep:InvalidZoneId:WARN",
 		"-Xep:IsInstanceIncompatibleType:WARN",
 		"-Xep:IsLoggableTagLength:WARN",
 		"-Xep:JUnitParameterMethodNotFound:WARN",
+		"-Xep:LenientFormatStringValidation:WARN",
 		"-Xep:LockOnBoxedPrimitive:WARN",
 		"-Xep:MathRoundIntLong:WARN",
 		"-Xep:MislabeledAndroidString:WARN",