PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Track change to JSSE provider

Browse Source 
Change-Id: I25d6612b12ab46b1f5c88c400b95bba1c023398a
This commit is contained in:
Kenny Root
2013-04-23 22:38:23 -07:00
parent c814271fe4
commit d76bc2248e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) 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_STATIC_JAVA_LIBRARIES := guava android-support-v4 jsr305
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional

3
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -45,7 +45,8 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
import com.android.org.conscrypt.TrustedCertificateStore;
public class TrustedCredentialsSettings extends Fragment { public class TrustedCredentialsSettings extends Fragment {