diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/com/android/settings/TrustedCredentialsSettings.java | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common +LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305 LOCAL_MODULE_TAGS := optional diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 687663a..cdfe7cd 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -45,7 +45,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; -import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore; + +import com.android.org.conscrypt.TrustedCertificateStore; public class TrustedCredentialsSettings extends Fragment { |