Merge "Use duck typing in X509TrustManagerExtensions" am: 9c3982f75d am: a26cafc2b2

am: cd03475fc4

* commit 'cd03475fc44ed52939e836b8c3a9426691beedd8':
  Use duck typing in X509TrustManagerExtensions

diff --cc core/java/android/net/http/X509TrustManagerExtensions.java
index 25ef8b5,7c23c23..6729347
--- 1/core/java/android/net/http/X509TrustManagerExtensions.java
--- 2/core/java/android/net/http/X509TrustManagerExtensions.java
+++ b/core/java/android/net/http/X509TrustManagerExtensions.java
@@@ -16,10 -16,11 +16,13 @@@
  
  package android.net.http;
  
 +import android.annotation.SystemApi;
 +
  import com.android.org.conscrypt.TrustManagerImpl;
  
+ import java.lang.reflect.Field;
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
  import java.security.cert.CertificateException;
  import java.security.cert.X509Certificate;
  import java.util.List;
@@@ -80,17 -123,20 +125,31 @@@ public class X509TrustManagerExtension
       * otherwise.
       */
      public boolean isUserAddedCertificate(X509Certificate cert) {
-         return mDelegate.isUserAddedCertificate(cert);
+         if (mDelegate != null) {
+             return mDelegate.isUserAddedCertificate(cert);
+         } else {
+             try {
+                 return (Boolean) mIsUserAddedCertificate.invoke(mTrustManager, cert);
+             } catch (IllegalAccessException e) {
+                 throw new RuntimeException("Failed to call isUserAddedCertificate", e);
+             } catch (InvocationTargetException e) {
+                 if (e.getCause() instanceof RuntimeException) {
+                     throw (RuntimeException) e.getCause();
+                 } else {
+                     throw new RuntimeException("isUserAddedCertificate failed", e.getCause());
+                 }
+             }
+         }
      }
 +
 +    /**
 +     * Returns {@code true} if the TrustManager uses the same trust configuration for the provided
 +     * hostnames.
 +     *
 +     * @hide
 +     */
 +    @SystemApi
 +    public boolean isSameTrustConfiguration(String hostname1, String hostname2) {
 +        return true;
 +    }
  }