undo default enabled

Author: jdcormie

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

@@ -158,7 +158,7 @@ public static BinderChannelBuilder forTarget(String target) {
   }
 
   private final ManagedChannelImplBuilder managedChannelImplBuilder;
-  final BinderClientTransportFactory.Builder transportFactoryBuilder;
+  private final BinderClientTransportFactory.Builder transportFactoryBuilder;
 
   private boolean strictLifecycleManagement;
 
@@ -176,10 +176,13 @@ private BinderChannelBuilder(
       managedChannelImplBuilder =
           new ManagedChannelImplBuilder(
               directAddress, directAddress.getAuthority(), transportFactoryBuilder, null);
+      // TODO(jdcormie): Rollout step 2: Pre-auth *all* addresses by default.
+      preAuthorizeServers(false);
     } else {
       managedChannelImplBuilder =
           new ManagedChannelImplBuilder(target, transportFactoryBuilder, null);
-      preAuthorizeServers(true); // Pre-authorize addresses from a NameResolver by default.
+      // TODO(jdcormie): Rollout step 1: Pre-auth NameResolver results by default.
+      preAuthorizeServers(false);
     }
     idleTimeout(60, TimeUnit.SECONDS);
   }

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

@@ -225,10 +225,5 @@ public Builder setPreAuthorizeServers(boolean preAuthorizeServers) {
       this.preAuthorizeServers = preAuthorizeServers;
       return this;
     }
-
-    /** Whether to check server addresses against the SecurityPolicy before binding to them. */
-    public boolean getPreAuthorizeServers() {
-      return this.preAuthorizeServers;
-    }
   }
 }

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

@@ -16,7 +16,6 @@
 
 package io.grpc.binder;
 
-import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.content.Context;
@@ -42,17 +41,4 @@ public void strictLifecycleManagementForbidsIdleTimers() {
       // Expected.
     }
   }
-
-  @Test
-  public void preAuthorizeTargetUris() {
-    BinderChannelBuilder builder = BinderChannelBuilder.forTarget("foo://bar", appContext);
-    assertThat(builder.transportFactoryBuilder.getPreAuthorizeServers()).isTrue();
-  }
-
-  @Test
-  public void noPreAuthorizeDirectAddresses() {
-    // TODO(jdcormie): Turn this on by default in a future release.
-    BinderChannelBuilder builder = BinderChannelBuilder.forAddress(addr, appContext);
-    assertThat(builder.transportFactoryBuilder.getPreAuthorizeServers()).isFalse();
-  }
 }