Don't set the ready timeout if we fail to resolve.

Author: jdcormie

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

@@ -648,38 +648,33 @@ public synchronized void onUnbound(Status reason) {
     @Override
     public synchronized Runnable start(ManagedClientTransport.Listener clientTransportListener) {
       this.clientTransportListener = checkNotNull(clientTransportListener);
-      return () -> {
-        synchronized (BinderClientTransport.this) {
-          if (inState(TransportState.NOT_STARTED)) {
-            setState(TransportState.SETUP);
-            if (preAuthorizeServer) {
-              preAuthorizeServer();
-            } else {
-              serviceBinding.bind();
-            }
-            if (readyTimeoutMillis >= 0) {
-              readyTimeoutFuture =
-                  getScheduledExecutorService()
-                      .schedule(
-                          BinderClientTransport.this::onReadyTimeout,
-                          readyTimeoutMillis,
-                          MILLISECONDS);
-            }
+      return this::startInternal;
+    }
+
+    private synchronized void startInternal() {
+      if (inState(TransportState.NOT_STARTED)) {
+        setState(TransportState.SETUP);
+        try {
+          if (preAuthorizeServer) {
+            preAuthorize(serviceBinding.resolve());
+          } else {
+            serviceBinding.bind();
           }
+        } catch (StatusException e) {
+          shutdownInternal(e.getStatus(), true);
+          return;
         }
-      };
+        if (readyTimeoutMillis >= 0) {
+          readyTimeoutFuture =
+              getScheduledExecutorService()
+                  .schedule(
+                      BinderClientTransport.this::onReadyTimeout, readyTimeoutMillis, MILLISECONDS);
+        }
+      }
     }
 
     @GuardedBy("this")
-    private void preAuthorizeServer() {
-      ServiceInfo serviceInfo;
-      try {
-        serviceInfo = serviceBinding.resolve();
-      } catch (StatusException e) {
-        shutdownInternal(e.getStatus(), true);
-        return;
-      }
-
+    private void preAuthorize(ServiceInfo serviceInfo) {
       // It's unlikely, but the identity/existence of this Service could change by the time we
       // actually connect. It doesn't matter though, because:
       // - If pre-auth fails (but would succeed against the server's new state), the grpc-core layer
@@ -705,6 +700,16 @@ public void onFailure(Throwable t) {
           offloadExecutor);
     }
 
+    private synchronized void handlePreAuthResult(Status authorization) {
+      if (inState(TransportState.SETUP)) {
+        if (!authorization.isOk()) {
+          shutdownInternal(authorization, true);
+        } else {
+          serviceBinding.bind();
+        }
+      }
+    }
+
     private synchronized void onReadyTimeout() {
       if (inState(TransportState.SETUP)) {
         readyTimeoutFuture = null;
@@ -846,16 +851,6 @@ private ListenableFuture<Status> checkServerAuthorizationAsync(int remoteUid) {
           : Futures.submit(() -> securityPolicy.checkAuthorization(remoteUid), offloadExecutor);
     }
 
-    private synchronized void handlePreAuthResult(Status authorization) {
-      if (inState(TransportState.SETUP)) {
-        if (!authorization.isOk()) {
-          shutdownInternal(authorization, true);
-        } else {
-          serviceBinding.bind();
-        }
-      }
-    }
-
     private synchronized void handleAuthResult(IBinder binder, Status authorization) {
       if (inState(TransportState.SETUP)) {
         if (!authorization.isOk()) {

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

@@ -205,7 +205,7 @@ public void clientAuthorizesServerUidsInOrder() throws Exception {
     //  test never exercises server SecurityPolicy.
     ShadowBinder.setCallingUid(11111); // UID of the server *process*.
 
-    serverPkgInfo.applicationInfo.uid = 22222;  // UID of the server *app*, which can be different.
+    serverPkgInfo.applicationInfo.uid = 22222; // UID of the server *app*, which can be different.
     shadowOf(application.getPackageManager()).installPackage(serverPkgInfo);
     shadowOf(application.getPackageManager()).addOrUpdateService(serviceInfo);
     server = newServer(Collections.emptyList());