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

Commit 3c10f535 authored by Kenny Root's avatar Kenny Root Committed by Gerrit Code Review
Browse files

Merge "Track change to JSSE provider"

parents c814271f d76bc224

Android.mk

+1 −1
Original line number Diff line number Diff line 
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 := guava android-support-v4 jsr305



LOCAL_MODULE_TAGS := optional

src/com/android/settings/TrustedCredentialsSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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 {