From da51e68e582ffa017543982297c831680d201a91 Mon Sep 17 00:00:00 2001 From: Maggie Benthall Date: Thu, 8 Aug 2013 22:35:44 -0400 Subject: Add methods for managing CAs to DevicePolicyManager(Service) Guard install/uninstall by enforcing that the caller have the new system-only permission MANAGE_CA_CERTIFICATES. Also include API methods for asking whether there are any User CA certs installed, or if one by a particular name is installed in the keystore. CA certs will be installed via KeyChain into the TrustedCertificateStore. Bug: 8232670 Change-Id: I17b47a452e72eb4fe556dc6db823a46c6e854be8 --- services/java/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services/java/Android.mk') diff --git a/services/java/Android.mk b/services/java/Android.mk index 95b28d981b6f..8c3d0f09197c 100644 --- a/services/java/Android.mk +++ b/services/java/Android.mk @@ -11,7 +11,7 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE:= services -LOCAL_JAVA_LIBRARIES := android.policy telephony-common +LOCAL_JAVA_LIBRARIES := android.policy conscrypt telephony-common include $(BUILD_JAVA_LIBRARY) -- cgit v1.2.3-59-g8ed1b