commit 4ff2296cb77305468531ae0c45f90b46f942a5a3
author Kenny Root <kroot@google.com> Thu Feb 14 10:17:06 2013 -0800
committer Kenny Root <kroot@google.com> Thu Feb 14 10:28:48 2013 -0800
tree 6673fe6197b071270216e5bb2ba5f429b82c175a
parent c8b0463643df1f1a4035d641e155f5e1cef8e1b0

KeyStore: stop using state()

Change-Id: Ib9a9af88a280a5442989a8199218a7ba82ce9e25

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 1c41957..a2b44e8 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -111,7 +111,7 @@
             if (alias == null) {
                 throw new NullPointerException("alias == null");
             }
-            if (!isKeyStoreUnlocked()) {
+            if (!mKeyStore.isUnlocked()) {
                 throw new IllegalStateException("keystore is "
                         + mKeyStore.state().toString());
             }
@@ -123,10 +123,6 @@
             }
         }
 
-        private boolean isKeyStoreUnlocked() {
-            return (mKeyStore.state() == KeyStore.State.UNLOCKED);
-        }
-
         @Override public void installCaCertificate(byte[] caCertificate) {
             checkCertInstallerOrSystemCaller();
             try {