Merge branch 'master' into keep-alive

Author: jdcormie

binder/src/main/java/io/grpc/binder/AndroidComponentAddress.java

@@ -58,7 +58,7 @@ public final class AndroidComponentAddress extends SocketAddress {
   @Nullable
   private final UserHandle targetUser; // null means the same user that hosts this process.
 
-  protected AndroidComponentAddress(Intent bindIntent, @Nullable UserHandle targetUser) {
+  private AndroidComponentAddress(Intent bindIntent, @Nullable UserHandle targetUser) {
     checkArgument(
         bindIntent.getComponent() != null || bindIntent.getPackage() != null,
         "'bindIntent' must be explicit. Specify either a package or ComponentName.");

binder/src/main/java/io/grpc/binder/ApiConstants.java

@@ -45,6 +45,7 @@ private ApiConstants() {}
    * "system app" client with special permissions. See {@link
    * AndroidComponentAddress.Builder#setTargetUser(UserHandle)} for details.
    */
+  @ExperimentalApi("https://github.com/grpc/grpc-java/issues/10173")
   public static final NameResolver.Args.Key<UserHandle> TARGET_ANDROID_USER =
       NameResolver.Args.Key.create("target-android-user");
 

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

@@ -589,7 +589,7 @@ public static final class BinderClientTransport extends BinderTransport
     @GuardedBy("this")
     @Nullable private ListenableFuture<Status> authResultFuture; // null before we check auth.
     @GuardedBy("this")
-    private ListenableFuture<Status> preAuthResultFuture;
+    @Nullable private ListenableFuture<Status> preAuthResultFuture; // null before we check auth.
 
     /**
      * Constructs a new transport instance.
@@ -814,7 +814,7 @@ void notifyTerminated() {
         readyTimeoutFuture = null;
       }
       if (preAuthResultFuture != null) {
-        preAuthResultFuture.cancel(false);
+        preAuthResultFuture.cancel(false);  // No effect if already complete.
       }
       if (authResultFuture != null) {
         authResultFuture.cancel(false);  // No effect if already complete.