PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sudheer Shanka
2016-02-11 14:21:05 +00:00
committed by Android (Google) Code Review
parent 0cfda1ad91 28eab080ca
commit fd9f4511d6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SecuritySettings.java
View File

@@ -513,7 +513,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
Settings.System.TEXT_SHOW_PASSWORD, 1) != 0); Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
} }
if (mResetCredentials != null) { if (mResetCredentials != null && !mResetCredentials.isDisabledByAdmin()) {
mResetCredentials.setEnabled(!mKeyStore.isEmpty()); mResetCredentials.setEnabled(!mKeyStore.isEmpty());
} }
} }