summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chad Brubaker <cbrubaker@google.com> 2018-06-07 11:40:57 -0700
committer Chad Brubaker <cbrubaker@google.com> 2018-06-07 11:51:06 -0700
commitfd707f670c3e0ab5f48b306709d908cb3cf9a63a (patch)
treeeba40dee814b7584fd99db5c0cee4e946f0b075f
parent8e0ad6534d00d85a3e09d2e207bc5b101f5ba905 (diff)
Do not preload NoPreloadHolder classes
These classes cannot be statically preloaded in Zygote. Change-Id: I7d9f10e634409bedfdd71f8daa43b8e23516638e Fixes: 109652611 Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testCaCertManagement
-rw-r--r--config/preloaded-classes4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/preloaded-classes b/config/preloaded-classes
index 2971ef83feb6..001479370fb9 100644
--- a/config/preloaded-classes
+++ b/config/preloaded-classes
@@ -2771,10 +2771,8 @@ android.security.net.config.PinSet
android.security.net.config.RootTrustManager
android.security.net.config.RootTrustManagerFactorySpi
android.security.net.config.SystemCertificateSource
-android.security.net.config.SystemCertificateSource$NoPreloadHolder
android.security.net.config.TrustedCertificateStoreAdapter
android.security.net.config.UserCertificateSource
-android.security.net.config.UserCertificateSource$NoPreloadHolder
android.security.net.config.XmlConfigSource
android.security.net.config.XmlConfigSource$ParserException
android.service.media.IMediaBrowserService
@@ -4556,7 +4554,6 @@ com.android.org.conscrypt.OpenSSLX509CertificateFactory$ParsingException
com.android.org.conscrypt.PeerInfoProvider
com.android.org.conscrypt.PeerInfoProvider$1
com.android.org.conscrypt.Platform
-com.android.org.conscrypt.Platform$NoPreloadHolder
com.android.org.conscrypt.Preconditions
com.android.org.conscrypt.SSLClientSessionCache
com.android.org.conscrypt.SSLParametersImpl
@@ -6072,7 +6069,6 @@ javax.net.ssl.ExtendedSSLSession
javax.net.ssl.HandshakeCompletedListener
javax.net.ssl.HostnameVerifier
javax.net.ssl.HttpsURLConnection
-javax.net.ssl.HttpsURLConnection$NoPreloadHolder
javax.net.ssl.KeyManager
javax.net.ssl.KeyManagerFactory
javax.net.ssl.KeyManagerFactory$1