commit 7209c0bb2f12fbd355115d8d171db033a18304e1
author Kenny Root <kroot@google.com> Thu Feb 14 12:50:34 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 14 12:50:34 2013 -0800
tree 2bd3bbb1b2cb77ac4176b8c29ef7f16c2ce49dd7
parent 30fe264f5c7b9eda127cbb8a181103240e2b32d0
parent 012e650ed2d1a994a651a7389db427045679da83

am dc7b3e3b: am 012e650e: Merge "KeyStore: stop using state()"

# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index e3a3ca2..c31cde7 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3341,7 +3341,7 @@
         // Tear down existing lockdown if profile was removed
         mLockdownEnabled = LockdownVpnTracker.isEnabled();
         if (mLockdownEnabled) {
-            if (mKeyStore.state() != KeyStore.State.UNLOCKED) {
+            if (!mKeyStore.isUnlocked()) {
                 Slog.w(TAG, "KeyStore locked; unable to create LockdownTracker");
                 return false;
             }