Skip to content

Commit 6d4e887

Browse files
andrewstadlerAndroid (Google) Code Review
authored andcommitted
Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev
2 parents 954a5d6 + 8071124 commit 6d4e887

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

core/java/android/net/X509TrustManagerExtensions.java renamed to core/java/android/net/http/X509TrustManagerExtensions.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
package android.net.http;
1818

19+
import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;
20+
1921
import java.security.cert.CertificateException;
2022
import java.security.cert.X509Certificate;
21-
import java.security.KeyManagementException;
2223
import java.util.List;
2324

2425
import javax.net.ssl.X509TrustManager;
2526

26-
import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl;
27-
2827
/**
2928
* X509TrustManager wrapper exposing Android-added features.
3029
*

0 commit comments

Comments
 (0)