Merge "Use NoPreloadHolder for certificate sources" into nyc-dev (c738e48e) · Commits · e / os / android_frameworks_base

core/java/android/security/net/config/SystemCertificateSource.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,10 @@ import java.io.File;
		* @hide
		*/
		public final class SystemCertificateSource extends DirectoryCertificateSource {
		private static class NoPreloadHolder {
		private static final SystemCertificateSource INSTANCE = new SystemCertificateSource();
		}

		private final File mUserRemovedCaDir;

		private SystemCertificateSource() {
		@@ -35,7 +38,7 @@ public final class SystemCertificateSource extends DirectoryCertificateSource {
		}

		public static SystemCertificateSource getInstance() {
		return INSTANCE;
		return NoPreloadHolder.INSTANCE;
		}

		@Override

+4 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,9 @@ import java.io.File;
		* @hide
		*/
		public final class UserCertificateSource extends DirectoryCertificateSource {
		private static class NoPreloadHolder {
		private static final UserCertificateSource INSTANCE = new UserCertificateSource();
		}

		private UserCertificateSource() {
		super(new File(
		@@ -33,7 +35,7 @@ public final class UserCertificateSource extends DirectoryCertificateSource {
		}

		public static UserCertificateSource getInstance() {
		return INSTANCE;
		return NoPreloadHolder.INSTANCE;
		}

		@Override