diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 60a086a5669..fd8bfafdde3 100644
--- 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());