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()); } }