Merge "Fixing a bug in the security menu."

2014-06-20 20:40:08 +00:00
parent 68f005fbd4 31648b54dc
commit c24ffca0f4
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -321,7 +321,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
                    TrustAgentUtils.TrustAgentComponentInfo trustAgentComponentInfo =
                            TrustAgentUtils.getSettingsComponent(pm, resolveInfo);
                    if (trustAgentComponentInfo.componentName == null ||
-                            !enabledTrustAgents.contains(trustAgentComponentInfo.componentName) ||
+                            !enabledTrustAgents.contains(
+                                    TrustAgentUtils.getComponentName(resolveInfo)) ||
                            TextUtils.isEmpty(trustAgentComponentInfo.title)) continue;
                    Preference trustAgentPreference =
                            new Preference(securityCategory.getContext());