Android 5.1.1 release 22
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlYF0v0ACgkQ6K0/gZqxDngQjgCdFES3lBiPN7L2PO5GU1KUuUUi
NmkAnjPedVnk2PrgBN30c8qKi/VgyzMc
=dR8a
-----END PGP SIGNATURE-----
Avoid things that cause CertBlacklist to be preinitialized

Move the CertBlacklist instance to a NoPreloadHolder, then move the
System.getenv call in CertBlacklist to a constructor so it's not called
during class initialization.

(cherry picked from commit 7a21b9a68f2c90bdde986a98a55816d0cf3ea73e)

Bug: 18013422
Change-Id: I39d0f43f948dec243d2d7cb79726d0642638b77a
3 files changed