diff --git a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java index dd685a972a..ae3210e63b 100644 --- a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java +++ b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java @@ -37,12 +37,9 @@ import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.MethodDescriptor; import io.grpc.internal.GrpcUtil; -import java.util.concurrent.Executor; -import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; -import javax.net.ssl.SSLSocketFactory; /** * Builds a {@link ManagedChannel} that, when provided with a {@link Context}, will automatically @@ -139,62 +136,6 @@ public final class AndroidChannelBuilder extends ForwardingChannelBuilder delegate() { return delegateBuilder; diff --git a/android/src/test/java/io/grpc/android/AndroidChannelBuilderTest.java b/android/src/test/java/io/grpc/android/AndroidChannelBuilderTest.java index bc365316f9..c69f7d541b 100644 --- a/android/src/test/java/io/grpc/android/AndroidChannelBuilderTest.java +++ b/android/src/test/java/io/grpc/android/AndroidChannelBuilderTest.java @@ -36,12 +36,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.Executor; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import javax.net.ssl.SSLSocketFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -100,27 +98,6 @@ public final class AndroidChannelBuilderTest { assertThat(androidBuilder.delegate()).isSameInstanceAs(wrappedBuilder); } - @Test - public void transportExecutor() { - AndroidChannelBuilder.forTarget("target") - .transportExecutor( - new Executor() { - @Override - public void execute(Runnable r) {} - }); - } - - @Test - public void sslSocketFactory() { - AndroidChannelBuilder.forTarget("target") - .sslSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault()); - } - - @Test - public void scheduledExecutorService() { - AndroidChannelBuilder.forTarget("target").scheduledExecutorService(new ScheduledExecutorImpl()); - } - @Test @Config(sdk = 23) public void nullContextDoesNotThrow_api23() {