diff options
| author | Kenny Root <kroot@google.com> | 2013-02-14 12:50:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-14 12:50:34 -0800 |
| commit | 0786207be59d34a8ba8a7a1e93602002fac97587 (patch) | |
| tree | e67ba5fcacecaafbfafb57ecc67c7c8fcea4c6d3 /services/java/com/android/server/ConnectivityService.java | |
| parent | 58a1ca6642d404b67e5c9e75076b9bbe08e4076b (diff) | |
| parent | dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29 (diff) | |
am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
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 e3a3ca208320..c31cde709424 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -3341,7 +3341,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; } |