From 199443d0620bc0300321e9c9d00d8c91f9695a2d Mon Sep 17 00:00:00 2001 From: Chengyuan Zhang Date: Tue, 27 Aug 2019 16:43:04 -0700 Subject: [PATCH 1/2] Removed ExperimentalApi annotation for AndroidChannelBuilder --- .../src/main/java/io/grpc/android/AndroidChannelBuilder.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java index ae3210e63b2..e45dea4bad0 100644 --- a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java +++ b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java @@ -31,7 +31,6 @@ import io.grpc.CallOptions; import io.grpc.ClientCall; import io.grpc.ConnectivityState; -import io.grpc.ExperimentalApi; import io.grpc.ForwardingChannelBuilder; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; @@ -51,7 +50,6 @@ * * @since 1.12.0 */ -@ExperimentalApi("https://github.com/grpc/grpc-java/issues/6043") public final class AndroidChannelBuilder extends ForwardingChannelBuilder { private static final String LOG_TAG = "AndroidChannelBuilder"; From 4129de561e3c3f9a4543870a08e72e3a44bb176b Mon Sep 17 00:00:00 2001 From: Chengyuan Zhang Date: Tue, 27 Aug 2019 17:05:38 -0700 Subject: [PATCH 2/2] Put ExperimentalApi annotation back to deprecated method. --- .../src/main/java/io/grpc/android/AndroidChannelBuilder.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java index e45dea4bad0..921c124b89a 100644 --- a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java +++ b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java @@ -31,6 +31,7 @@ import io.grpc.CallOptions; import io.grpc.ClientCall; import io.grpc.ConnectivityState; +import io.grpc.ExperimentalApi; import io.grpc.ForwardingChannelBuilder; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; @@ -88,6 +89,7 @@ public static AndroidChannelBuilder forAddress(String name, int port) { * * @deprecated Use {@link #usingBuilder(ManagedChannelBuilder)} instead. */ + @ExperimentalApi("https://github.com/grpc/grpc-java/issues/6043") @Deprecated public static AndroidChannelBuilder fromBuilder(ManagedChannelBuilder builder) { return usingBuilder(builder);