From 3d52ab02abd1648ce65a2708274bc571f92b7d3d Mon Sep 17 00:00:00 2001
From: Chris Povirk <cpovirk@google.com>
Date: Wed, 1 Apr 2026 16:50:54 -0400
Subject: [PATCH] Annotate `CharsetProvider`.

This follows https://github.com/google/xplat/commit/1c360139652cffbf14542b1aba34e33ec82090dc
---
 .../share/classes/java/nio/charset/spi/CharsetProvider.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java b/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
index 4522f07d227..548bb08486d 100644
--- a/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
+++ b/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
@@ -28,6 +28,8 @@
 import java.nio.charset.Charset;
 import java.util.Iterator;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Charset service-provider class.
@@ -79,7 +81,7 @@
  *
  * @see java.nio.charset.Charset
  */
-
+@NullMarked
 public abstract class CharsetProvider {
 
     /**
@@ -109,6 +111,6 @@ protected CharsetProvider() {
      *          or {@code null} if the named charset
      *          is not supported by this provider
      */
-    public abstract Charset charsetForName(String charsetName);
+    public abstract @Nullable Charset charsetForName(String charsetName);
 
 }