diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-13 09:51:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-13 09:51:55 +0000 |
| commit | e3f96a98ab2f4a5952cf6a7e21b0bb7929c315a9 (patch) | |
| tree | 5d267aa85d703bfa88ff762ba447687a6cd58d14 /android/src/android/net/http/CertificateChainValidator.java | |
| parent | 693d3a3639a854bc3d39bfb9f87550f5365e29b5 (diff) | |
| parent | 3e387462b084cf0c62e89c21cfd071df50163e39 (diff) | |
| download | android_external_apache-http-e3f96a98ab2f4a5952cf6a7e21b0bb7929c315a9.tar.gz android_external_apache-http-e3f96a98ab2f4a5952cf6a7e21b0bb7929c315a9.tar.bz2 android_external_apache-http-e3f96a98ab2f4a5952cf6a7e21b0bb7929c315a9.zip | |
Merge "Unbundle org.apache.http.legacy."
Diffstat (limited to 'android/src/android/net/http/CertificateChainValidator.java')
| -rw-r--r-- | android/src/android/net/http/CertificateChainValidator.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/android/src/android/net/http/CertificateChainValidator.java b/android/src/android/net/http/CertificateChainValidator.java index bf3fe02..d45e83f 100644 --- a/android/src/android/net/http/CertificateChainValidator.java +++ b/android/src/android/net/http/CertificateChainValidator.java @@ -19,7 +19,7 @@ package android.net.http; import com.android.org.conscrypt.SSLParametersImpl; import com.android.org.conscrypt.TrustManagerImpl; -import android.util.Slog; +import android.util.Log; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -44,8 +44,6 @@ import javax.net.ssl.X509TrustManager; /** * Class responsible for all server certificate validation functionality - * - * {@hide} */ public class CertificateChainValidator { private static final String TAG = "CertificateChainValidator"; @@ -176,10 +174,10 @@ public class CertificateChainValidator { tmf = TrustManagerFactory.getInstance("X.509"); tmf.init((KeyStore) null); } catch (NoSuchAlgorithmException e) { - Slog.w(TAG, "Couldn't find default X.509 TrustManagerFactory"); + Log.w(TAG, "Couldn't find default X.509 TrustManagerFactory"); return; } catch (KeyStoreException e) { - Slog.w(TAG, "Couldn't initialize default X.509 TrustManagerFactory", e); + Log.w(TAG, "Couldn't initialize default X.509 TrustManagerFactory", e); return; } @@ -195,7 +193,7 @@ public class CertificateChainValidator { } } if (!sentUpdate) { - Slog.w(TAG, "Didn't find a TrustManager to handle CA list update"); + Log.w(TAG, "Didn't find a TrustManager to handle CA list update"); } } |