Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use NoPreloadHolder for certificate sources" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-14 00:35:48 +00:00
committed by Android (Google) Code Review
parent 3c76d062ae 319f9fe102
commit c738e48ed6
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/security/net/config/SystemCertificateSource.java
View File

@@ -25,7 +25,10 @@ import java.io.File;
* @hide * @hide
*/ */
public final class SystemCertificateSource extends DirectoryCertificateSource { public final class SystemCertificateSource extends DirectoryCertificateSource {
private static final SystemCertificateSource INSTANCE = new SystemCertificateSource(); private static class NoPreloadHolder {
private static final SystemCertificateSource INSTANCE = new SystemCertificateSource();
}
private final File mUserRemovedCaDir; private final File mUserRemovedCaDir;
private SystemCertificateSource() { private SystemCertificateSource() {
@@ -35,7 +38,7 @@ public final class SystemCertificateSource extends DirectoryCertificateSource {
} }
public static SystemCertificateSource getInstance() { public static SystemCertificateSource getInstance() {
return INSTANCE; return NoPreloadHolder.INSTANCE;
} }
@Override @Override

6
core/java/android/security/net/config/UserCertificateSource.java
View File

@@ -25,7 +25,9 @@ import java.io.File;
* @hide * @hide
*/ */
public final class UserCertificateSource extends DirectoryCertificateSource { public final class UserCertificateSource extends DirectoryCertificateSource {
private static final UserCertificateSource INSTANCE = new UserCertificateSource(); private static class NoPreloadHolder {
private static final UserCertificateSource INSTANCE = new UserCertificateSource();
}
private UserCertificateSource() { private UserCertificateSource() {
super(new File( super(new File(
@@ -33,7 +35,7 @@ public final class UserCertificateSource extends DirectoryCertificateSource {
} }
public static UserCertificateSource getInstance() { public static UserCertificateSource getInstance() {
return INSTANCE; return NoPreloadHolder.INSTANCE;
} }
@Override @Override