Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix entrerprise strings replacement for Safety Center." into main

Browse Source
This commit is contained in:
Elliot Sisteron
2023-08-02 12:11:17 +00:00
committed by Android (Google) Code Review
parent b042f81e34 4688f3f642
commit fb86e84186
5 changed files with 67 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
import com.android.settings.safetycenter.SafetyCenterUtils;
import com.android.settings.safetycenter.SafetyCenterUtils.EnterpriseOverrideString;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.trustagent.TrustAgentListPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -54,15 +53,7 @@ public class SecurityAdvancedSettings extends DashboardFragment {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
List<EnterpriseOverrideString> securityOverrideStrings =
SafetyCenterUtils.getEnterpriseOverrideStringForSecurityEntries();
for (int i = 0; i < securityOverrideStrings.size(); i++) {
EnterpriseOverrideString overrideString = securityOverrideStrings.get(i);
replaceEnterpriseStringTitle(
overrideString.getPreferenceKey(),
overrideString.getOverrideKey(),
overrideString.getResource());
}
SafetyCenterUtils.replaceEnterpriseStringsForSecurityEntries(this);
}
@Override