commit 3bad7fe9d311844dd6533c73630d6cb7e4da785a
author Kenny Root <kroot@google.com> Thu Feb 14 20:18:15 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 14 20:18:15 2013 +0000
tree 7cb5eb46ad66496fa30e45ec7b6781013d70082f
parent c23edbe6d997522e8c25ba7f52da500f8decd396
parent 5d45af7ce08042bae0ff7523fe894eac1c0ebc52

Merge "KeyStore: stop using state()"

src/com/android/certinstaller/CertInstaller.java

diff --git a/src/com/android/certinstaller/CertInstaller.java b/src/com/android/certinstaller/CertInstaller.java
index c953416..a95dcac 100644
--- a/src/com/android/certinstaller/CertInstaller.java
+++ b/src/com/android/certinstaller/CertInstaller.java
@@ -132,7 +132,7 @@
 
     private boolean needsKeyStoreAccess() {
         return ((mCredentials.hasKeyPair() || mCredentials.hasUserCertificate())
-                && (mKeyStore.state() != KeyStore.State.UNLOCKED));
+                && !mKeyStore.isUnlocked());
     }
 
     @Override