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 
am: c738e48ed6

Change-Id: Iae1170534a10b81778e9e1cd3df8e5fca62f7546
This commit is contained in:
Chad Brubaker
2016-06-14 00:49:25 +00:00
committed by android-build-merger
parent a17a07ad8e c738e48ed6
commit 66bd9229dd
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
*/
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 SystemCertificateSource() {
@@ -35,7 +38,7 @@ public final class SystemCertificateSource extends DirectoryCertificateSource {
}
public static SystemCertificateSource getInstance() {
return INSTANCE;
return NoPreloadHolder.INSTANCE;
}
@Override

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

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