Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f3fd45b authored by Andy Stadler's avatar Andy Stadler Committed by Android Git Automerger
Browse files

am fe013183: am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct... 

am fe013183: am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev

* commit 'fe013183':
  Move X509TrustManagerExtensions to correct directory
parents ce0f2a8d fe013183

core/java/android/net/X509TrustManagerExtensions.java→core/java/android/net/http/X509TrustManagerExtensions.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -16,15 +16,14 @@ 




package android.net.http;

package android.net.http;





import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;



import java.security.cert.CertificateException;

import java.security.cert.CertificateException;

import java.security.cert.X509Certificate;

import java.security.cert.X509Certificate;

import java.security.KeyManagementException;

import java.util.List;

import java.util.List;





import javax.net.ssl.X509TrustManager;

import javax.net.ssl.X509TrustManager;





import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;



/**

/**

 * X509TrustManager wrapper exposing Android-added features.

 * X509TrustManager wrapper exposing Android-added features.

 *

 *