From ef8d53e09bb85e5282340f71866750863b0ab6e4 Mon Sep 17 00:00:00 2001
From: Jan Tomljanovic <jtomljanovic@google.com>
Date: Fri, 21 May 2021 19:44:03 +0100
Subject: [PATCH] Avoid cold start of the security hub app.

Test: manual
Bug: 185351065
Change-Id: I85729ffff5a4a8e8b6fb9815a0fcc5a7b7a8720f
---
 .../TopLevelSecurityEntryPreferenceController.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
index 8fab3c9dbd1..964482e08d5 100644
--- a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
+++ b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
@@ -27,8 +27,12 @@ import com.android.settings.overlay.FeatureFactory;
 
 public class TopLevelSecurityEntryPreferenceController extends BasePreferenceController {
 
+    private final SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider;
+
     public TopLevelSecurityEntryPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
+        mSecuritySettingsFeatureProvider = FeatureFactory.getFactory(mContext)
+                .getSecuritySettingsFeatureProvider();
     }
 
     @Override
@@ -42,11 +46,9 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon
             return super.handlePreferenceTreeClick(preference);
         }
 
-        SecuritySettingsFeatureProvider securitySettingsFeatureProvider =
-                FeatureFactory.getFactory(mContext).getSecuritySettingsFeatureProvider();
-        if (securitySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) {
+        if (mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) {
             String alternativeFragmentClassname =
-                    securitySettingsFeatureProvider
+                    mSecuritySettingsFeatureProvider
                             .getAlternativeSecuritySettingsFragmentClassname();
             if (alternativeFragmentClassname != null) {
                 new SubSettingLauncher(mContext)