From fd707f670c3e0ab5f48b306709d908cb3cf9a63a Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Thu, 7 Jun 2018 11:40:57 -0700 Subject: [PATCH] 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 --- config/preloaded-classes | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/preloaded-classes b/config/preloaded-classes index 2971ef83feb67..001479370fb9b 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