diff options
| author | Kenny Root <kroot@google.com> | 2013-02-14 20:18:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-14 20:18:09 +0000 |
| commit | 9657ba0edc8bab5a36c26bcd94366149aed63331 (patch) | |
| tree | c2d5554829d9dfce6c387a7a41a2218d5bd5f276 /services/java/com/android/server/ConnectivityService.java | |
| parent | 37edbbc62fa031c75ce5a1298fdd07d981907e89 (diff) | |
| parent | b9594ce9ebb3f5f303a280f04312ae5754ce3560 (diff) | |
Merge "KeyStore: stop using state()"
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index cccaf1cc483d..e5cfdf6a9fcc 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -3384,7 +3384,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { // 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; } |