hide reflection mess in a static method

Author: jdcormie

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

@@ -31,11 +31,11 @@
 import androidx.annotation.AnyThread;
 import androidx.annotation.MainThread;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.VerifyException;
 import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.grpc.Status;
 import io.grpc.StatusException;
 import io.grpc.binder.BinderChannelCredentials;
-import java.lang.reflect.Method;
 import java.util.concurrent.Executor;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -257,39 +257,32 @@ private static int getIdentifier(UserHandle userHandle) throws ReflectiveOperati
   }
 
   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 packageManager, Intent intent, int flags, UserHandle targetUserHandle) {
+    try {
+      return (ResolveInfo)
           packageManager
               .getClass()
-              .getMethod("resolveServiceAsUser", Intent.class, int.class, int.class);
-      args = new Object[] {bindIntent, flags, getIdentifier(targetUserHandle)};
+              .getMethod("resolveServiceAsUser", Intent.class, int.class, int.class)
+              .invoke(packageManager, intent, flags, getIdentifier(targetUserHandle));
+    } catch (ReflectiveOperationException e) {
+      throw new VerifyException(e);
     }
-    return (ResolveInfo) resolveService.invoke(packageManager, args);
   }
 
   @AnyThread
   public ServiceInfo resolve() throws StatusException {
     checkState(sourceContext != null);
-    try {
-      ResolveInfo resolveInfo =
-          resolveServiceAsUser(sourceContext.getPackageManager(), bindIntent, 0, targetUserHandle);
-      if (resolveInfo == null) {
-        throw Status.UNIMPLEMENTED // Same code as when bindService() returns false.
-            .withDescription("resolveService(" + bindIntent + ") returned null")
-            .asException();
-      }
-      return resolveInfo.serviceInfo;
-    } catch (ReflectiveOperationException e) {
-      throw Status.fromThrowable(e).asRuntimeException();
+    PackageManager packageManager = sourceContext.getPackageManager();
+    ResolveInfo resolveInfo =
+        targetUserHandle != null
+            ? resolveServiceAsUser(packageManager, bindIntent, 0, targetUserHandle)
+            : packageManager.resolveService(bindIntent, 0);
+    if (resolveInfo == null) {
+      throw Status.UNIMPLEMENTED // Same status code as when bindService() returns false.
+          .withDescription("resolveService(" + bindIntent + ") returned null")
+          .asException();
     }
+    return resolveInfo.serviceInfo;
   }
 
   @MainThread