diff --git a/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java b/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java index b1153aaa46..43301efdc4 100644 --- a/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java +++ b/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java @@ -250,8 +250,8 @@ public final class AltsChannelBuilder extends ForwardingChannelBuilderThis is primarily intended for Android users when a device is transitioning from a cellular - * to a wifi connection. Initially the device will maintain both the cellular and wifi - * connections, but the OS also issues a notification that after a short time the cellular - * connection will be terminated. Apps may invoke this method to ensure that new RPCs are created - * using the wifi connection, rather than the soon-to-be-disconnected cellular network. + * to a wifi connection. The OS will issue a notification that a new network (wifi) has been made + * the default, but for approximately 30 seconds the device will maintain both the cellular + * and wifi connections. Apps may invoke this method to ensure that new RPCs are created using the + * new default wifi network, rather than the soon-to-be-disconnected cellular network. * *

No-op if not supported by implementation. * * @since 1.11.0 */ @ExperimentalApi("https://github.com/grpc/grpc-java/issues/4056") - public void prepareToLoseNetwork() {} + public void enterIdle() {} } diff --git a/core/src/main/java/io/grpc/internal/ForwardingManagedChannel.java b/core/src/main/java/io/grpc/internal/ForwardingManagedChannel.java index 295d23f508..31147e7c61 100644 --- a/core/src/main/java/io/grpc/internal/ForwardingManagedChannel.java +++ b/core/src/main/java/io/grpc/internal/ForwardingManagedChannel.java @@ -83,7 +83,7 @@ abstract class ForwardingManagedChannel extends ManagedChannel { } @Override - public void prepareToLoseNetwork() { - delegate.prepareToLoseNetwork(); + public void enterIdle() { + delegate.enterIdle(); } } diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java index 8470626ec8..12115fd9c2 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java @@ -396,7 +396,7 @@ final class ManagedChannelImpl extends ManagedChannel implements Instrumented