Merge "Avoid cold start of the security hub app." into sc-dev

This commit is contained in:
Jan Tomljanovic
2021-05-25 09:46:18 +00:00
committed by Android (Google) Code Review

View File

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