From 2eae60271a2cb373f0b39026726379fa64b93bc2 Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Tue, 1 Dec 2015 13:03:27 -0800 Subject: [PATCH] Don't use IntegralToString Fix master build (cherry picked from commit 7845e44c0cff3ec6a9ea0e5059fa1f7019ef0eb7) Change-Id: Ic99a5e868b5d42e7bf72ef5388e30f070b6655d8 --- core/java/android/security/net/config/DirectoryCertificateSource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/security/net/config/DirectoryCertificateSource.java b/core/java/android/security/net/config/DirectoryCertificateSource.java index bf88e582999c..bf29efabb00a 100644 --- a/core/java/android/security/net/config/DirectoryCertificateSource.java +++ b/core/java/android/security/net/config/DirectoryCertificateSource.java @@ -32,6 +32,7 @@ import java.security.cert.X509Certificate; import java.util.Set; import libcore.io.IoUtils; +import com.android.org.conscrypt.Hex; import com.android.org.conscrypt.NativeCrypto; import javax.security.auth.x500.X500Principal; @@ -136,7 +137,7 @@ abstract class DirectoryCertificateSource implements CertificateSource { private String getHash(X500Principal name) { int hash = NativeCrypto.X509_NAME_hash_old(name); - return IntegralToString.intToHexString(hash, false, 8); + return Hex.intToHexString(hash, 8); } private X509Certificate readCertificate(String file) { -- 2.11.0