am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev

* commit '29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
  Show disabled trust agents as off.
This commit is contained in:
Kenny Guy
2015-07-16 13:15:57 +00:00
committed by Android Git Automerger

View File

@@ -113,6 +113,7 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements
if (disabledByDevicePolicy if (disabledByDevicePolicy
&& mDpm.getTrustAgentConfiguration(null, agent.component) == null) { && mDpm.getTrustAgentConfiguration(null, agent.component) == null) {
preference.setChecked(false);
preference.setEnabled(false); preference.setEnabled(false);
preference.setSummary(R.string.trust_agent_disabled_device_admin); preference.setSummary(R.string.trust_agent_disabled_device_admin);
} }