flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cronet: Add internal API to specify Network 

cl/661194496
This commit is contained in:
Eric Anderson 2024-08-13 10:27:48 -07:00
parent fd8734f341
commit c2eccca3bc
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java
View File

@ -20,9 +20,12 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static io.grpc.internal.GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE;
import android.net.Network;
import android.os.Build;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.DoNotCall;
import io.grpc.ChannelCredentials;
import io.grpc.ChannelLogger;
@ -105,6 +108,7 @@ public final class CronetChannelBuilder extends ForwardingChannelBuilder2<Cronet
private int trafficStatsTag;
private boolean trafficStatsUidSet;
private int trafficStatsUid;
private Network network;
private CronetChannelBuilder(String host, int port, CronetEngine cronetEngine) {
final class CronetChannelTransportFactoryBuilder implements ClientTransportFactoryBuilder {
@ -190,6 +194,13 @@ public final class CronetChannelBuilder extends ForwardingChannelBuilder2<Cronet
return this;
}
/** Sets the network ID to use for this channel traffic. */
@CanIgnoreReturnValue
CronetChannelBuilder bindToNetwork(@Nullable Network network) {
this.network = network;
return this;
}
/**
* Provides a custom scheduled executor service.
*
@ -210,7 +221,12 @@ public final class CronetChannelBuilder extends ForwardingChannelBuilder2<Cronet
ClientTransportFactory buildTransportFactory() {
return new CronetTransportFactory(
new TaggingStreamFactory(
cronetEngine, trafficStatsTagSet, trafficStatsTag, trafficStatsUidSet, trafficStatsUid),
cronetEngine,
trafficStatsTagSet,
trafficStatsTag,
trafficStatsUidSet,
trafficStatsUid,
network),
MoreExecutors.directExecutor(),
scheduledExecutorService,
maxMessageSize,
@ -294,18 +310,21 @@ public final class CronetChannelBuilder extends ForwardingChannelBuilder2<Cronet
private final int trafficStatsTag;
private final boolean trafficStatsUidSet;
private final int trafficStatsUid;
private final Network network;
TaggingStreamFactory(
CronetEngine cronetEngine,
boolean trafficStatsTagSet,
int trafficStatsTag,
boolean trafficStatsUidSet,
int trafficStatsUid) {
int trafficStatsUid,
Network network) {
this.cronetEngine = cronetEngine;
this.trafficStatsTagSet = trafficStatsTagSet;
this.trafficStatsTag = trafficStatsTag;
this.trafficStatsUidSet = trafficStatsUidSet;
this.trafficStatsUid = trafficStatsUid;
this.network = network;
}
@Override
@ -320,6 +339,11 @@ public final class CronetChannelBuilder extends ForwardingChannelBuilder2<Cronet
if (trafficStatsUidSet) {
builder.setTrafficStatsUid(trafficStatsUid);
}
if (network != null) {
if (Build.VERSION.SDK_INT >= 23) {
builder.bindToNetwork(network.getNetworkHandle());
}
}
return builder;
}
}

7
cronet/src/main/java/io/grpc/cronet/InternalCronetChannelBuilder.java
View File

@ -16,7 +16,9 @@
package io.grpc.cronet;
import android.net.Network;
import io.grpc.Internal;
import org.checkerframework.checker.nullness.qual.Nullable;
/**
* Internal {@link CronetChannelBuilder} accessor. This is intended for usage internal to the gRPC
@ -58,4 +60,9 @@ public final class InternalCronetChannelBuilder {
public static void setTrafficStatsUid(CronetChannelBuilder builder, int uid) {
builder.setTrafficStatsUid(uid);
}
/** Sets the network {@link android.net.Network} to use when relying traffic by this channel. */
public static void bindToNetwork(CronetChannelBuilder builder, @Nullable Network network) {
builder.bindToNetwork(network);
}
}