diff --git a/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyJob.java b/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyJob.java index 1c20b989a4..abede878eb 100644 --- a/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyJob.java +++ b/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyJob.java @@ -38,6 +38,8 @@ public class CertificateTransparencyJob extends BroadcastReceiver { private final CertificateTransparencyDownloader mCertificateTransparencyDownloader; private final AlarmManager mAlarmManager; + private boolean mDependenciesReady = false; + /** Creates a new {@link CertificateTransparencyJob} object. */ public CertificateTransparencyJob( Context context, @@ -50,9 +52,6 @@ public class CertificateTransparencyJob extends BroadcastReceiver { } void initialize() { - mDataStore.load(); - mCertificateTransparencyDownloader.initialize(); - mContext.registerReceiver( this, new IntentFilter(ConfigUpdate.ACTION_UPDATE_CT_LOGS), @@ -81,6 +80,11 @@ public class CertificateTransparencyJob extends BroadcastReceiver { if (Config.DEBUG) { Log.d(TAG, "Starting CT daily job."); } + if (!mDependenciesReady) { + mDataStore.load(); + mCertificateTransparencyDownloader.initialize(); + mDependenciesReady = true; + } mDataStore.setProperty(Config.CONTENT_URL, Config.URL_LOG_LIST); mDataStore.setProperty(Config.METADATA_URL, Config.URL_SIGNATURE); diff --git a/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyService.java b/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyService.java index 782e6b5b6d..615172781f 100644 --- a/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyService.java +++ b/networksecurity/service/src/com/android/server/net/ct/CertificateTransparencyService.java @@ -43,7 +43,7 @@ public class CertificateTransparencyService extends ICertificateTransparencyMana return DeviceConfig.getBoolean( Config.NAMESPACE_NETWORK_SECURITY, Config.FLAG_SERVICE_ENABLED, - /* defaultValue= */ false) + /* defaultValue= */ true) && certificateTransparencyService() && certificateTransparencyConfiguration(); }