commit 79a806525a1e74191601a97e39d81c4b2727a54c
author Kenny Root <kroot@google.com> Thu Feb 14 20:18:09 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 14 20:18:09 2013 +0000
tree 9f7693aee5e72893a2e1e06d68d7364dda7be76e
parent 3f051210cdee7f9e66abe947e898e1673586c858
parent e3a37b21ca7784d9c6efae9c4481a3c4f60288e6

Merge "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 cccaf1c..e5cfdf6 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3384,7 +3384,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;
             }