| commit | 73e396f8ffcb89f466c8767ccd9864ec2b1cd203 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 22 23:46:02 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 22 23:46:02 2013 +0000 |
| tree | b1b76285a948dc89ecb365da15c4c801877bc874 | |
| parent | 9c4bba564745dcaa2aaa63c156f6d11afe05202e [diff] | |
| parent | c4372c3e3fd2d0be54341973bd72ec618931057c [diff] |
Merge "Fix Clear Credentials item" into jb-mr2-dev
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index c324dd8..e97c73f 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java
@@ -452,7 +452,7 @@ } if (mResetCredentials != null) { - mResetCredentials.setEnabled(!mKeyStore.isUnlocked()); + mResetCredentials.setEnabled(!mKeyStore.isEmpty()); } }