From 7aa5598dc04ef72438f62071ecaa84d781c86b6a Mon Sep 17 00:00:00 2001
From: Larry Safran <107004254+larry-safran@users.noreply.github.com>
Date: Mon, 6 Mar 2023 20:49:37 +0000
Subject: [PATCH] api:stabilize offloadExecutor. (#9931)

* 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 726f2e1ba5..0113ca9098 100644
--- a/api/src/main/java/io/grpc/ManagedChannelBuilder.java
+++ b/api/src/main/java/io/grpc/ManagedChannelBuilder.java
@@ -119,7 +119,6 @@ public abstract class ManagedChannelBuilder<T extends ManagedChannelBuilder<T>>
    * @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 48f835f994..3087601491 100644
--- a/api/src/main/java/io/grpc/NameResolver.java
+++ b/api/src/main/java/io/grpc/NameResolver.java
@@ -366,7 +366,6 @@ public abstract class NameResolver {
      * @since 1.25.0
      */
     @Nullable
-    @ExperimentalApi("https://github.com/grpc/grpc-java/issues/6279")
     public Executor getOffloadExecutor() {
       return executor;
     }
@@ -510,7 +509,6 @@ public abstract class NameResolver {
        *
        * @since 1.25.0
        */
-      @ExperimentalApi("https://github.com/grpc/grpc-java/issues/6279")
       public Builder setOffloadExecutor(Executor executor) {
         this.executor = executor;
         return this;