am 934ad54f: am 73e396f8: Merge "Fix Clear Credentials item" into jb-mr2-dev

* commit '934ad54f338a71baddac98c4bfeb67b070453984':
  Fix Clear Credentials item
This commit is contained in:
Kenny Root
2013-04-23 11:23:42 -07:00
committed by Android Git Automerger

View File

@@ -452,7 +452,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
}
if (mResetCredentials != null) {
mResetCredentials.setEnabled(!mKeyStore.isUnlocked());
mResetCredentials.setEnabled(!mKeyStore.isEmpty());
}
}