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

Use correct category key for SecurityAdvancedSettings

Browse Source 
based on the type of active Security Settings

Test: atest SettingsUnitTests:SecurityAdvancedSettingsTest

Bug: 206001340
Change-Id: I7bdac4b26653eedb45e3e2f056e6804a6c16cb18
This commit is contained in:
Yuri Ufimtsev
2022-01-05 10:42:11 +00:00
parent c02d474ba1
commit 5ccccc181e
4 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/security/SecurityAdvancedSettings.java
View File

@@ -25,6 +25,8 @@ import com.android.settings.biometrics.combination.CombinedBiometricProfileStatu
import com.android.settings.biometrics.face.FaceProfileStatusPreferenceController;
import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.safetycenter.SafetyCenterStatus;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.trustagent.TrustAgentListPreferenceController;
import com.android.settings.widget.PreferenceCategoryController;
@@ -47,6 +49,10 @@ public class SecurityAdvancedSettings extends DashboardFragment {
private static final String TAG = "SecurityAdvancedSettings";
private static final String WORK_PROFILE_SECURITY_CATEGORY = "security_category_profile";
/** Used in case of old Security settings when SafetyCenter is disabled */
private static final String CATEGORY_SECURITY_LEGACY_ADVANCED_SETTINGS =
"com.android.settings.category.ia.legacy_advanced_security";
@Override
public int getMetricsCategory() {
return SettingsEnums.SECURITY_ADVANCED;
@@ -54,7 +60,19 @@ public class SecurityAdvancedSettings extends DashboardFragment {
@Override
public String getCategoryKey() {
return CategoryKey.CATEGORY_SECURITY_ADVANCED_SETTINGS;
if (SafetyCenterStatus.isEnabled()) {
return CategoryKey.CATEGORY_SECURITY_ADVANCED_SETTINGS;
} else {
final SecuritySettingsFeatureProvider securitySettingsFeatureProvider =
FeatureFactory.getFactory(getContext())
.getSecuritySettingsFeatureProvider();
if (securitySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) {
return securitySettingsFeatureProvider.getAlternativeAdvancedSettingsCategoryKey();
} else {
return CATEGORY_SECURITY_LEGACY_ADVANCED_SETTINGS;
}
}
}
@Override