Skip to content

Commit 1be801f

Browse files
committed
google-java-format
1 parent 1aa8557 commit 1be801f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

binder/src/main/java/io/grpc/binder/internal/BinderTransport.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,8 +586,10 @@ public static final class BinderClientTransport extends BinderTransport
586586
private ScheduledFuture<?> readyTimeoutFuture; // != null iff timeout scheduled.
587587
@GuardedBy("this")
588588
@Nullable private ListenableFuture<Status> authResultFuture; // null before we check auth.
589+
589590
@GuardedBy("this")
590-
@Nullable private ListenableFuture<Status> preAuthResultFuture; // null before we pre-auth.
591+
@Nullable
592+
private ListenableFuture<Status> preAuthResultFuture; // null before we pre-auth.
591593

592594
/**
593595
* Constructs a new transport instance.
@@ -812,7 +814,7 @@ void notifyTerminated() {
812814
readyTimeoutFuture = null;
813815
}
814816
if (preAuthResultFuture != null) {
815-
preAuthResultFuture.cancel(false); // No effect if already complete.
817+
preAuthResultFuture.cancel(false); // No effect if already complete.
816818
}
817819
if (authResultFuture != null) {
818820
authResultFuture.cancel(false); // No effect if already complete.

binder/src/test/java/io/grpc/binder/BinderChannelBuilderTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package io.grpc.binder;
1818

19-
import static com.google.common.truth.Truth.assertThat;
2019
import static org.junit.Assert.fail;
2120

2221
import android.content.Context;

binder/src/test/java/io/grpc/binder/internal/RobolectricBinderTransportTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,7 @@ public void eagAttributeCanOverrideChannelPreAuthServerSetting() throws Exceptio
249249
newClientTransportFactoryBuilder()
250250
.setPreAuthorizeServers(preAuthServersParam) // To be overridden.
251251
.setSecurityPolicy(securityPolicy)
252-
.buildClientTransportFactory()
253-
)
252+
.buildClientTransportFactory())
254253
.build();
255254
runIfNotNull(client.start(mockClientTransportListener));
256255

0 commit comments

Comments
 (0)