undo some merging mistakes

Author: jdcormie

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

@@ -19,6 +19,8 @@
 import android.content.Intent;
 import android.content.pm.ServiceInfo;
 import android.os.UserHandle;
+import io.grpc.Attributes;
+import io.grpc.EquivalentAddressGroup;
 import io.grpc.ExperimentalApi;
 import io.grpc.NameResolver;
 
@@ -46,15 +48,15 @@ private ApiConstants() {}
       NameResolver.Args.Key.create("target-android-user");
 
   /**
-   * Marks an {@link io.grpc.EquivalentAddressGroup} as needing pre-authorization.
+   * Lets you override a Channel's pre-auth configuration (see {@link
+   * BinderChannelBuilder#preAuthorizeServers(boolean)} for a given {@link EquivalentAddressGroup}.
    *
-   * <p>Clients should authorize servers before connecting to them, but older versions of the binder
-   * transport didn't do so. While this important extra security check is now possible (see {@link
-   * BinderChannelBuilder#preAuthorizeServers(boolean)}, it remains optional, because it's a slight
-   * behavior change and has a small performance cost and we don't want to break existing apps.
+   * <p>A {@link NameResolver} that discovers servers from an untrusted source like PackageManager
+   * can use this to force server pre-auth and prevent abuse.
    */
-  public static final Attributes.Key<Void> PRE_AUTH_REQUIRED =
-      Attributes.Key.create("pre-auth-required");
+  @EquivalentAddressGroup.Attr
+  public static final Attributes.Key<Boolean> PRE_AUTH_SERVER_OVERRIDE =
+      Attributes.Key.create("pre-auth-server-override");
 
   /**
    * The authentic ServiceInfo for an {@link io.grpc.EquivalentAddressGroup} of {@link

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

@@ -47,14 +47,10 @@ interface Observer {
     void onUnbound(Status reason);
   }
 
-  /** Fetches details about the remote service from PackageManager *before* binding to it. */
-  @AnyThread
-  ServiceInfo resolve();
-
   /**
    * Fetches details about the remote Service from PackageManager without binding to it.
    *
-   * <p>Resolving an untrusted address before binding to it lets you screen out problematic servers
+   * <p>Resolving an untrusted address before binding to it lets you screen out unauthorized servers
    * before giving them a chance to run. However, note that the identity/existence of the resolved
    * Service can change between the time this method returns and the time you actually bind/connect
    * to it. For example, suppose the target package gets uninstalled right after this method

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

@@ -257,42 +257,6 @@ private static int getIdentifier(UserHandle userHandle) throws ReflectiveOperati
     return (int) userHandle.getClass().getDeclaredMethod("getIdentifier").invoke(userHandle);
   }
 
-  private static ResolveInfo resolveServiceAsUser(
-      PackageManager packageManager, Intent bindIntent, int flags, UserHandle targetUserHandle)
-      throws ReflectiveOperationException {
-    Method resolveService;
-    Object[] args;
-    if (targetUserHandle == null) {
-      resolveService =
-          packageManager.getClass().getMethod("resolveService", Intent.class, int.class);
-      args = new Object[] {bindIntent, flags};
-    } else {
-      resolveService =
-          packageManager
-              .getClass()
-              .getMethod("resolveServiceAsUser", Intent.class, int.class, int.class);
-      args = new Object[] {bindIntent, flags, getIdentifier(targetUserHandle)};
-    }
-    return (ResolveInfo) resolveService.invoke(packageManager, args);
-  }
-
-  @AnyThread
-  public ServiceInfo resolve() {
-    checkState(sourceContext != null);
-    try {
-      ResolveInfo resolveInfo =
-          resolveServiceAsUser(sourceContext.getPackageManager(), bindIntent, 0, targetUserHandle);
-      return resolveInfo != null ? resolveInfo.serviceInfo : null;
-    } catch (ReflectiveOperationException e) {
-      throw Status.fromThrowable(e).asRuntimeException();
-    }
-  }
-
-  // Sadly we must call this system API reflectively since it isn't part of the Android SDK.
-  private static int getIdentifier(UserHandle userHandle) throws ReflectiveOperationException {
-    return (int) userHandle.getClass().getMethod("getIdentifier").invoke(userHandle);
-  }
-
   // Sadly we must call this system API reflectively since it isn't part of the Android SDK.
   private static ResolveInfo resolveServiceAsUser(
       PackageManager packageManager, Intent intent, int flags, UserHandle targetUserHandle) {

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

@@ -42,17 +42,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();
-  }
 }