From 0a8fd9413f13f2d17bf6a7cb0b9c3a9720c555dd Mon Sep 17 00:00:00 2001
From: larry-safran <lsafran@google.com>
Date: Fri, 3 Mar 2023 16:48:18 -0800
Subject: [PATCH 1/2] api:Stabalize offloadExecutor.

fixes #6279
---
 api/src/main/java/io/grpc/ManagedChannelBuilder.java | 1 -
 api/src/main/java/io/grpc/NameResolver.java          | 2 --
 2 files changed, 3 deletions(-)

diff --git a/api/src/main/java/io/grpc/ManagedChannelBuilder.java b/api/src/main/java/io/grpc/ManagedChannelBuilder.java
index 726f2e1ba53..0113ca90985 100644
--- a/api/src/main/java/io/grpc/ManagedChannelBuilder.java
+++ b/api/src/main/java/io/grpc/ManagedChannelBuilder.java
@@ -119,7 +119,6 @@ public static ManagedChannelBuilder<?> forTarget(String target) {
    * @throws UnsupportedOperationException if unsupported
    * @since 1.25.0
    */
-  @ExperimentalApi("https://github.com/grpc/grpc-java/issues/6279")
   public T offloadExecutor(Executor executor) {
     throw new UnsupportedOperationException();
   }
diff --git a/api/src/main/java/io/grpc/NameResolver.java b/api/src/main/java/io/grpc/NameResolver.java
index 48f835f9943..23dda6994b3 100644
--- a/api/src/main/java/io/grpc/NameResolver.java
+++ b/api/src/main/java/io/grpc/NameResolver.java
@@ -366,7 +366,6 @@ public ChannelLogger getChannelLogger() {
      * @since 1.25.0
      */
     @Nullable
-    @ExperimentalApi("https://github.com/grpc/grpc-java/issues/6279")
     public Executor getOffloadExecutor() {
       return executor;
     }
@@ -379,7 +378,6 @@ public Executor getOffloadExecutor() {
      * @since 1.49.0
      */
     @Nullable
-    @ExperimentalApi("https://github.com/grpc/grpc-java/issues/9406")
     public String getOverrideAuthority() {
       return overrideAuthority;
     }

From 3655a832216e5c98f6ab2f2a938ce8c425905757 Mon Sep 17 00:00:00 2001
From: larry-safran <lsafran@google.com>
Date: Mon, 6 Mar 2023 10:40:39 -0800
Subject: [PATCH 2/2] Fix which method was being stabilized

---
 api/src/main/java/io/grpc/NameResolver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/io/grpc/NameResolver.java b/api/src/main/java/io/grpc/NameResolver.java
index 23dda6994b3..30876014910 100644
--- a/api/src/main/java/io/grpc/NameResolver.java
+++ b/api/src/main/java/io/grpc/NameResolver.java
@@ -378,6 +378,7 @@ public Executor getOffloadExecutor() {
      * @since 1.49.0
      */
     @Nullable
+    @ExperimentalApi("https://github.com/grpc/grpc-java/issues/9406")
     public String getOverrideAuthority() {
       return overrideAuthority;
     }
@@ -508,7 +509,6 @@ public Builder setChannelLogger(ChannelLogger channelLogger) {
        *
        * @since 1.25.0
        */
-      @ExperimentalApi("https://github.com/grpc/grpc-java/issues/6279")
       public Builder setOffloadExecutor(Executor executor) {
         this.executor = executor;
         return this;