Merge "Avoid cold start of the security hub app." into sc-dev am: d747c8db1d am: 96e110ff2f am: 32cb5149e5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14683790

Change-Id: Id8bc15059bb1d1e64574cefba84f70ab96f4581d
This commit is contained in:
Jan Tomljanovic
2021-05-25 13:18:06 +00:00
committed by Automerger Merge Worker

View File

@@ -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)