From 28eab080caea9f24e0b6da65af18c945a64c2a1a Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 10 Feb 2016 21:35:54 +0000 Subject: [PATCH] Disable clear credential option when disallowed by admin. Bug: 27119114 Change-Id: I0f60880b125149cd1a9aa5f4e9a5340f49042367 --- src/com/android/settings/SecuritySettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index daa8bb42b19..e89b0d25732 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -513,7 +513,7 @@ public class SecuritySettings extends SettingsPreferenceFragment Settings.System.TEXT_SHOW_PASSWORD, 1) != 0); } - if (mResetCredentials != null) { + if (mResetCredentials != null && !mResetCredentials.isDisabledByAdmin()) { mResetCredentials.setEnabled(!mKeyStore.isEmpty()); } }