Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c67f2016 authored by Chad Brubaker's avatar Chad Brubaker Committed by android-build-merger
Browse files

Merge \\\"Use NoPreloadHolder for certificate sources\\\" into nyc-dev am:... 

Merge \\\"Use NoPreloadHolder for certificate sources\\\" into nyc-dev am: c738e48e am: 66bd9229
am: 8ae604b6

Change-Id: Id136b62eda2e0ef13ff6473b16f5db6586930871
parents e3d3740f 8ae604b6

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

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

+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