Merge "Disable clear credential option when disallowed by admin." into nyc-dev

2016-02-11 14:21:05 +00:00
parent 0cfda1ad91 28eab080ca
commit fd9f4511d6
1 changed files with 1 additions and 1 deletions
--- 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());
        }
    }