PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I27674d88fc75587c97146eb20f542352ad4ea104
This commit is contained in:
Jan Tomljanovic
2021-05-25 12:26:36 +00:00
committed by Automerger Merge Worker
parent 18f4cf60f1 96e110ff2f
commit 32cb5149e5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
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)