Merge "Fixing a bug in the security menu."

This commit is contained in:
Ido Ofir
2014-06-20 20:40:08 +00:00
committed by Android (Google) Code Review

View File

@@ -321,7 +321,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
TrustAgentUtils.TrustAgentComponentInfo trustAgentComponentInfo = TrustAgentUtils.TrustAgentComponentInfo trustAgentComponentInfo =
TrustAgentUtils.getSettingsComponent(pm, resolveInfo); TrustAgentUtils.getSettingsComponent(pm, resolveInfo);
if (trustAgentComponentInfo.componentName == null || if (trustAgentComponentInfo.componentName == null ||
!enabledTrustAgents.contains(trustAgentComponentInfo.componentName) || !enabledTrustAgents.contains(
TrustAgentUtils.getComponentName(resolveInfo)) ||
TextUtils.isEmpty(trustAgentComponentInfo.title)) continue; TextUtils.isEmpty(trustAgentComponentInfo.title)) continue;
Preference trustAgentPreference = Preference trustAgentPreference =
new Preference(securityCategory.getContext()); new Preference(securityCategory.getContext());