Fixed ReflectionIsTemporaryException.

It was hiding real exceptions (such as SecurityException).

Test: manual verification
Fixes: 186459587

Change-Id: I8098df792542b466dfa937616dbd68bbeab993b1

Author: the-felipeal

app/src/main/java/com/afwsamples/testdpc/common/ReflectionUtil.java

@@ -1,12 +1,18 @@
 package com.afwsamples.testdpc.common;
 
+import android.util.Log;
+
 import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 
 /**
  * Common utility functions for reflection. These are intended to be used to test APIs before they
  * are added to the SDK. There should be not uses of this class checked in to the repository.
  */
 public final class ReflectionUtil {
+
+    private static final String TAG = ReflectionUtil.class.getSimpleName();
+
     /**
      * Calls a method on an object with the given arguments. This can be used when the method is not
      * in the SDK. If any arguments are {@code null} or primitive types you must use
@@ -82,7 +88,8 @@ private static <T> T invoke(Class<?> clazz, Object obj, String methodName,
             return result;
         } catch (SecurityException | NoSuchMethodException | IllegalArgumentException
                 | IllegalAccessException | InvocationTargetException e) {
-            throw new ReflectionIsTemporaryException("Failed to invoke method", e);
+            ReflectionIsTemporaryException.rethrow(e, clazz, methodName, args);
+            return null;
         }
     }
 
@@ -133,10 +140,27 @@ public static String stringConstant(Class<?> clazz, String fieldName)
      *
      * To handle this, gracefully fail the operation in progress.
      */
-    public static class ReflectionIsTemporaryException extends Exception {
-        public ReflectionIsTemporaryException(String message, Throwable cause) {
+    public static final class ReflectionIsTemporaryException extends Exception {
+
+        private static final long serialVersionUID = 1L;
+
+        private ReflectionIsTemporaryException(String message, Throwable cause) {
             super(message, cause);
         }
+
+        public static void rethrow(Exception e, Class<?> clazz, String methodName, Object... args)
+                throws ReflectionIsTemporaryException {
+            String method = clazz.getSimpleName() + "." + methodName + "("
+                + (args == null || args.length == 0 ? "" : Arrays.toString(args)) + ")";
+            Log.w(TAG, "Exception calling method " + method + ":", e);
+            if (e instanceof InvocationTargetException) {
+                Throwable cause = e.getCause();
+                if (cause instanceof RuntimeException) {
+                    throw (RuntimeException) cause;
+                }
+            }
+            throw new ReflectionIsTemporaryException("Failed to invoke " + method, e);
+        }
     }
 
     private ReflectionUtil() {